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

Commit 8dc3be62 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576 

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

Change-Id: I3929ce59312776fb513e9754eb7b24852ca82bbe
parents 37a3ed28 00b14576

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -503,6 +503,8 @@ applications that come with the platform 
        <permission name="android.permission.UPDATE_DEVICE_STATS" />

        <!-- Permission required for GTS test - PendingSystemUpdateTest -->

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

        <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->

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

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ 
    <!-- Permission required for CTS test - SettingsMultiPaneDeepLinkTest -->

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



    <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->

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



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"