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

Commit bdaa4ce9 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Add permission to shell for CTS test" am: 55f4ea80 

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

Change-Id: I6bf25fa9a034c33f735f6f3e0261200a12e89a9c
parents 797210a9 55f4ea80

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -444,6 +444,7 @@ 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" />

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

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

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

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

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

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

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

packages/Shell/AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -427,8 +427,9 @@ 
    <!-- Permission needed for CTS test - DisplayTest -->

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

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

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





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

    <!-- Permissions 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" />

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





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

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

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

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