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

Commit 67dfa491 authored by Billy Lau's avatar Billy Lau Committed by Android Git Automerger
Browse files

am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the... 

am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev

* commit 'e4c3fd72':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
parents 283b7ace e4c3fd72

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26424,6 +26424,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.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 −0
Original line number Diff line number Diff line
@@ -28485,6 +28485,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.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

+15 −0
Original line number Diff line number Diff line
@@ -561,6 +561,21 @@ public final class Settings { 
    public static final String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS =

            "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";



    /**

     * Activity Action: Show settings to toggle permission to draw on top of

     * other apps.

     * <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_OVERLAY_PERMISSION =

            "android.settings.MANAGE_OVERLAY_PERMISSION";



    /**

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

     * <p>

core/java/com/android/internal/logging/MetricsLogger.java

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class MetricsLogger implements MetricsConstants { 
    public static final int ACTION_BRIGHTNESS = 218;

    public static final int ACTION_BRIGHTNESS_AUTO = 219;

    public static final int BRIGHTNESS_DIALOG = 220;

    public static final int SYSTEM_ALERT_WINDOW_APPS = 221;

    // Temporary constants go here, to await migration to MetricsConstants.



    public static void visible(Context context, int category) throws IllegalArgumentException {

core/res/AndroidManifest.xml

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

        android:label="@string/permlab_systemAlertWindow"

        android:description="@string/permdesc_systemAlertWindow"

        android:protectionLevel="dangerous" />

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



    <!-- ================================== -->

    <!-- Permissions affecting the system wallpaper -->