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

Commit 96d00ab3 authored by Billy Lau's avatar Billy Lau Committed by Android (Google) Code Review
Browse files

Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev

parents 4fb81253 22b3f4cb

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -26416,7 +26416,8 @@ 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.MANAGE_OVERLAY_PERMISSION";

    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_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

+2 −1
Original line number Diff line number Diff line
@@ -28472,7 +28472,8 @@ 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.MANAGE_OVERLAY_PERMISSION";

    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_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

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

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_OVERLAY_PERMISSION =

            "android.settings.MANAGE_OVERLAY_PERMISSION";

            "android.settings.action.MANAGE_OVERLAY_PERMISSION";



    /**

     * Activity Action: Show settings to toggle apps' capablity to

     * 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";



    /**

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

core/res/AndroidManifest.xml

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

        android:label="@string/permlab_writeSettings"

        android:description="@string/permdesc_writeSettings"

        android:protectionLevel="dangerous" />

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



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

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

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

+0 −1
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ final class DefaultPermissionGrantPolicy { 
                    && doesPackageSupportRuntimePermissions(setupPackage)) {

                grantRuntimePermissionsLPw(setupPackage, PHONE_PERMISSIONS, userId);

                grantRuntimePermissionsLPw(setupPackage, CONTACTS_PERMISSIONS, userId);

                grantRuntimePermissionsLPw(setupPackage, SETTINGS_PERMISSIONS, userId);

            }



            // Camera