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

Commit a3599c78 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android Git Automerger
Browse files

am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope... 

am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"

* commit '8ea98a8a':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
parents db97900f 8ea98a8a

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -26395,8 +26395,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";

    field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION";

    field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";

    field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";

    field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -28451,8 +28451,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";

    field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";

    field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION";

    field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";

    field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";

    field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";

core/java/android/provider/Settings.java

+1 −16
Original line number Diff line number Diff line
@@ -574,22 +574,7 @@ public final class Settings { 
     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_OVERLAY_PERMISSION =

            "android.settings.action.MANAGE_OVERLAY_PERMISSION";



    /**

     * Activity Action: Show settings to toggle permission to allow app to

     * read/write system settings.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_WRITE_SETTINGS =

            "android.settings.action.MANAGE_WRITE_SETTINGS";

            "android.settings.MANAGE_OVERLAY_PERMISSION";



    /**

     * Activity Action: Show screen of details about a particular application.

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ 
    <permission android:name="android.permission.WRITE_SETTINGS"

        android:label="@string/permlab_writeSettings"

        android:description="@string/permdesc_writeSettings"

        android:protectionLevel="signature|system|appop|pre23" />

        android:protectionLevel="dangerous" />



    <!-- @SystemApi Allows an application to modify the Google service map.

    <p>Not for use by third-party applications. -->