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

Commit 285f6781 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Give CONTROL_DEVICE_LIGHTS permission to the shell" am: 668daf03 

Change-Id: I8f0d55f7a310e6dff8cf552e5ddf929eb8d0c2b7
parents c1363ad2 668daf03

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -350,6 +350,8 @@ applications that come with the platform 
        <!-- Permissions required to test ambient display. -->

        <!-- Permissions required to test ambient display. -->

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

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

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

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

        <!-- Permission required to test lights control APIs. -->

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

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

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

    </privapp-permissions>

    </privapp-permissions>

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -236,6 +236,9 @@ 
    <!-- Permission needed to test mainline permission module rollback -->

    <!-- Permission needed to test mainline permission module rollback -->

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

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





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

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



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

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

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

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

                android:defaultToDeviceProtectedStorage="true"

                android:defaultToDeviceProtectedStorage="true"