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

Commit 7f1264e6 authored by Bohdan Petrivskyy's avatar Bohdan Petrivskyy Committed by Android (Google) Code Review
Browse files

Merge "Removes redundant @SystemApi for registerMonitorCallback and from... 

Merge "Removes redundant @SystemApi for registerMonitorCallback and from MONITOR_DEVICE_CONFIG_ACCESS permission declaration."
parents 57bda3c2 7139780e

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,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";

core/java/android/provider/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -14325,7 +14325,6 @@ public final class Settings { 
         *

         * @hide

         */

        @SystemApi

        @RequiresPermission(Manifest.permission.MONITOR_DEVICE_CONFIG_ACCESS)

        public static void registerMonitorCallback(@NonNull ContentResolver resolver,

                @NonNull RemoteCallback callback) {

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2771,7 +2771,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"/>