From 4056d87005ac9c7e7cda14bc2b8e4c505510d30e Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Fri, 31 Jan 2020 14:59:28 -0800
Subject: [PATCH] Do not use @SystemApi(client = MODULE_APPS)
 (documents/settings)

There will be no special protection mechanisms around MODULE_APPS,
so we're going to remove it for now.

All the MODULE_APPS should be protected with a permission, etc, so
the change should be safe.

Bug: 148177503
Test: Build / treehugger
Change-Id: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
Merged-In: I76328c2d5aaa3f171bf8afde5b3d1accad8c2e2b
---
 api/module-app-current.txt                     | 8 --------
 api/system-current.txt                         | 1 +
 core/java/android/app/NotificationChannel.java | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/api/module-app-current.txt b/api/module-app-current.txt
index 4307e675e4312..d802177e249b3 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);
-  }
-
-}
-
diff --git a/api/system-current.txt b/api/system-current.txt
index b3dea03772d71..5f17b3265f582 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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;
   }
diff --git a/core/java/android/app/NotificationChannel.java b/core/java/android/app/NotificationChannel.java
index 8ad2b36ae0da0..b08f0354327cb 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 @@ 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;