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

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

Merge "Grant HDMI_CEC permission to Shell" am: 63340382 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3cb8d7c84d02bba0f1283fe5d8d4b4f5373a96c
parents 1cc61523 63340382

data/etc/privapp-permissions-platform.xml

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

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

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

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

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

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

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

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

    </privapp-permissions>

    </privapp-permissions>





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

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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -334,6 +334,9 @@ 
    <!-- Permission needed for CTS test - TimeManagerTest -->

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

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

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





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

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



    <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"