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

Commit 0f642cfe authored by Anthony Hugh's avatar Anthony Hugh Committed by Android (Google) Code Review
Browse files

Merge "Add DEVICE_LOCK permission to Shell to support ATS test"

parents 4795c7ff a07ccbe6

data/etc/privapp-permissions-platform.xml

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

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

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

        <!-- 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
@@ -596,6 +596,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"