Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2cf5100 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" am: 9bf0c496 

Change-Id: Iadcd9db4717f1350621ce1565c1f79b75af5eced
parents 407f4c5c 9bf0c496

api/module-app-current.txt

+0 −8
Original line number Diff line number Diff line 
// Signature format: 2.0
 
package android.app {



  public final class NotificationChannel implements android.os.Parcelable {

    method public void setBlockableSystem(boolean);

  }



}

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ package android.app { 
    method public int getUserLockedFields();

    method public boolean isDeleted();

    method public void populateFromXml(org.xmlpull.v1.XmlPullParser);

    method public void setBlockableSystem(boolean);

    method public org.json.JSONObject toJson() throws org.json.JSONException;

    method public void writeXml(org.xmlpull.v1.XmlSerializer) throws java.io.IOException;

  }

core/java/android/app/NotificationChannel.java

+1 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package android.app;



import static android.annotation.SystemApi.Client.MODULE_APPS;



import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;
@@ -325,7 +323,7 @@ public final class NotificationChannel implements Parcelable { 
     * @param blockableSystem if {@code true}, allows users to block notifications on this channel.

     * @hide

     */

    @SystemApi(client = MODULE_APPS)

    @SystemApi

    @TestApi

    public void setBlockableSystem(boolean blockableSystem) {

        mBlockableSystem = blockableSystem;