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

Commit 5f9c22a9 authored by Omer Ozer's avatar Omer Ozer Committed by Android (Google) Code Review
Browse files

Merge "Add factory reset prepare permission to shell so it can be used in cts tests." into main

parents 0f2a5879 9a6650d1

data/etc/privapp-permissions-platform.xml

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

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

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

        <!-- Permission required for Cts test - CtsSettingsTestCases -->

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -932,6 +932,9 @@ 
    <uses-permission

        android:name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW" />



    <!-- Permission required for Cts test - CtsSettingsTestCases -->

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



    <application

        android:label="@string/app_label"

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