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

Commit 1ec3cc1f authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "Add the permissions for Settings deep link" into sc-v2-dev am: bf989b80 am: ffa9c730 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15612682

Change-Id: I38d556d6b7a35c0c5459796f12ccd0dea24ad6fc
parents 373d04fc ffa9c730

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ package android { 
    field public static final String INTERACT_ACROSS_PROFILES = "android.permission.INTERACT_ACROSS_PROFILES";

    field public static final String INTERNET = "android.permission.INTERNET";

    field public static final String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";

    field public static final String LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK = "android.permission.LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK";

    field public static final String LOADER_USAGE_STATS = "android.permission.LOADER_USAGE_STATS";

    field public static final String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";

    field public static final String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ package android { 
    field public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY";

    field public static final String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";

    field public static final String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK";

    field public static final String ALLOW_PLACE_IN_TWO_PANE_SETTINGS = "android.permission.ALLOW_PLACE_IN_TWO_PANE_SETTINGS";

    field public static final String AMBIENT_WALLPAPER = "android.permission.AMBIENT_WALLPAPER";

    field public static final String APPROVE_INCIDENT_REPORTS = "android.permission.APPROVE_INCIDENT_REPORTS";

    field public static final String ASSOCIATE_COMPANION_DEVICES = "android.permission.ASSOCIATE_COMPANION_DEVICES";

core/res/AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -4870,6 +4870,18 @@ 
    <permission android:name="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA"

                android:protectionLevel="signature|privileged" />



    <!-- An application needs this permission for

         {@link android.provider.Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK} to show its

         {@link android.app.Activity} in 2-pane of Settings app. -->

    <permission android:name="android.permission.LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK"

                android:protectionLevel="signature|preinstalled" />



    <!-- @SystemApi {@link android.app.Activity} should require this permission to ensure that only

         the settings app can embed it in a 2-pane window.

         @hide -->

    <permission android:name="android.permission.ALLOW_PLACE_IN_TWO_PANE_SETTINGS"

                android:protectionLevel="signature" />



    <!-- @SystemApi Allows applications to set a live wallpaper.

         @hide XXX Change to signature once the picker is moved to its

         own apk as Ghod Intended. -->