commit 9bf0c496df132f9e01dff678e1d8a76b957f54cb
author Anton Hansson <hansson@google.com> Mon Feb 03 22:29:37 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 03 22:29:37 2020 +0000
tree cdf69138d8e8208b65bc0d03354b83e10dfd2543
parent 91d0f80387adb62d7c5bf185568de1aa6e8df9c6
parent 4056d87005ac9c7e7cda14bc2b8e4c505510d30e

Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)"

api/module-app-current.txt

diff --git a/api/module-app-current.txt b/api/module-app-current.txt
index 4307e67..d802177 100644
--- a/api/module-app-current.txt
+++ b/api/module-app-current.txt
@@ -1,9 +1 @@
 // Signature format: 2.0
-package android.app {
-
-  public final class NotificationChannel implements android.os.Parcelable {
-    method public void setBlockableSystem(boolean);
-  }
-
-}
-

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9c93366..f8f0036 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -553,6 +553,7 @@
     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

diff --git a/core/java/android/app/NotificationChannel.java b/core/java/android/app/NotificationChannel.java
index 8ad2b36..b08f035 100644
--- a/core/java/android/app/NotificationChannel.java
+++ b/core/java/android/app/NotificationChannel.java
@@ -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 @@
      * @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;