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

Commit f245f49e authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fd 

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

Change-Id: I4ced22912f1f7d28342a30dbf8e61f3558785fef
parents f1f65ab7 bc9061fd

data/etc/privapp-permissions-platform.xml

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

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

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

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

        <!-- Permissions required for CTS test - android.server.biometrics -->

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

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

packages/Shell/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -455,8 +455,9 @@ 
    <!-- Permission needed for CTS test - MatchContentFrameRateTest -->

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



    <!-- Permission needed for CTS test - TimeManagerTest -->

    <!-- Permissions needed for CTS test - TimeManagerTest -->

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

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



    <!-- Permission required for CTS test - android.server.biometrics -->

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