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

Commit 8b13751e authored by Paul Crowley's avatar Paul Crowley Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Add permissions to the shell to allow creation of CTS tests for trust." and "Add TRUST_LISTENER to the shell for use in CTS tests"" am: a6bd8b31 am: 1eadb6ed

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



Change-Id: I1df2962f88324136a391583c6924fea153c35969
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5f19964 1eadb6ed

data/etc/privapp-permissions-platform.xml

+0 −4
Original line number Diff line number Diff line
@@ -342,10 +342,6 @@ applications that come with the platform 
        <permission name="android.permission.SET_WALLPAPER_COMPONENT" />

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

        <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" />

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

        <!-- 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

+0 −5
Original line number Diff line number Diff line
@@ -578,11 +578,6 @@ 
    <!-- 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" />

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



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

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