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

Commit 69dc957b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow ROLE_HOME to use FLAG_SLIPPERY" into tm-dev am: 588f598f 

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

Change-Id: I46a126d21659b74e8b9043d8b8096a29a59722c2
parents 80276091 588f598f

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ package android { 
    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_MULTI_PANE_SETTINGS = "android.permission.ALLOW_PLACE_IN_MULTI_PANE_SETTINGS";

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

    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

+3 −3
Original line number Diff line number Diff line
@@ -6160,10 +6160,10 @@ 
    <!-- Allows input events to be monitored. Very dangerous!  @hide -->

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

                android:protectionLevel="signature|recents" />

    <!-- Allows the use of FLAG_SLIPPERY, which permits touch events to slip from the current

         window to the window where the touch currently is on top of.  @hide -->

    <!-- @SystemApi Allows the use of FLAG_SLIPPERY, which permits touch events to slip from the

         current window to the window where the touch currently is on top of.  @hide -->

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

                android:protectionLevel="signature|recents" />

                android:protectionLevel="signature|privileged|recents|role" />

    <!--  Allows the caller to change the associations between input devices and displays.

        Very dangerous! @hide -->

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