From 7139780e10ae5e7cfd457715b7a32ea4cb7ebdfc Mon Sep 17 00:00:00 2001
From: Bohdan Petrivskyy <bpetrivs@google.com>
Date: Tue, 18 Feb 2020 17:26:13 +0000
Subject: [PATCH] Removes redundant @SystemApi for registerMonitorCallback and
 from MONITOR_DEVICE_CONFIG_ACCESS permission declaration.

Test: no need, just removing annotation.

Bug: 149487442
Change-Id: I73bbe9672eb5c8c0fd043c07a5e27463f0f14e5c
---
 api/system-current.txt                   | 1 -
 core/java/android/provider/Settings.java | 1 -
 core/res/AndroidManifest.xml             | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 24936d5784f8f..c5da3c3c06829 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -133,7 +133,6 @@ package android {
     field public static final String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";
     field public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE";
     field public static final String MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE = "android.permission.MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE";
-    field public static final String MONITOR_DEVICE_CONFIG_ACCESS = "android.permission.MONITOR_DEVICE_CONFIG_ACCESS";
     field public static final String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";
     field public static final String NETWORK_AIRPLANE_MODE = "android.permission.NETWORK_AIRPLANE_MODE";
     field public static final String NETWORK_CARRIER_PROVISIONING = "android.permission.NETWORK_CARRIER_PROVISIONING";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index b9207e5a12d56..ad022f8dbbdbf 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -14230,7 +14230,6 @@ public final class Settings {
          *
          * @hide
          */
-        @SystemApi
         @RequiresPermission(Manifest.permission.MONITOR_DEVICE_CONFIG_ACCESS)
         public static void registerMonitorCallback(@NonNull ContentResolver resolver,
                 @NonNull RemoteCallback callback) {
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ff696715e94db..f6ec93550fbcf 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2730,7 +2730,7 @@
     <permission android:name="android.permission.READ_DEVICE_CONFIG"
         android:protectionLevel="signature|preinstalled" />
 
-    <!-- @SystemApi @hide Allows an application to monitor config settings access.
+    <!-- @hide Allows an application to monitor {@link android.provider.Settings.Config} access.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.MONITOR_DEVICE_CONFIG_ACCESS"
         android:protectionLevel="signature"/>