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

Commit 3a26a482 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add permissions to the shell to allow creation of CTS tests for trust."... 

Merge "Add permissions to the shell to allow creation of CTS tests for trust." am: 139e007d am: d9b1d582 am: 6ce69e06

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

Change-Id: Id3401787f19347595c613d637adf2a7e6e09fbd9
parents 7b7fcd3e 6ce69e06

data/etc/privapp-permissions-platform.xml

+3 −0
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ applications that come with the platform 
        <permission name="android.permission.SET_WALLPAPER" />

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

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

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

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

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

        <!-- Permissions required for Incremental CTS tests -->

        <permission name="com.android.permission.USE_INSTALLER_V2"/>

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

packages/Shell/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -528,6 +528,10 @@ 
    <!-- Permission required for CTS test - PeopleManagerTest -->

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



    <!-- Permissions required for CTS test - TrustTestCases -->

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

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



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

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