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

Commit b59b661e authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Allow Shell to have permission for CTS." into tm-dev am: a2df99e5 

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



Change-Id: Icfbf9844bb4bf65b6c3a39b1b7325e1290a4e238
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7a66523 a2df99e5

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ applications that come with the platform 
        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>

        <permission name="android.permission.MANAGE_ACCESSIBILITY"/>

        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>

        <permission name="android.permission.ACCESS_FPS_COUNTER"/>

        <permission name="android.permission.MANAGE_GAME_MODE"/>

        <permission name="android.permission.MANAGE_GAME_ACTIVITY" />

        <permission name="android.permission.MANAGE_LOW_POWER_STANDBY" />

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,9 @@ 
    <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />

    <uses-permission android:name="android.permission.TRUST_LISTENER" />



    <!-- Permission required for CTS test - CtsTaskFpsCallbackTestCases -->

    <uses-permission android:name="android.permission.ACCESS_FPS_COUNTER" />



    <!-- Permission required for CTS test - CtsGameManagerTestCases -->

    <uses-permission android:name="android.permission.MANAGE_GAME_MODE" />