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

Commit 720bf04d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev am:... 

Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev am: 7058f994 am: ab17fa36

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

Change-Id: I08ac3647fdfaa0d2b328c30d1e5a8d16e1a0abf4
parents 6acc0131 ab17fa36

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ applications that come with the platform 
        <!-- Permissions required for CTS test - TVInputManagerTest -->

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

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

        <permission name="com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS" />

        <permission name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>

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

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

        <!-- Permissions required for GTS test - GtsDialerAudioTestCases -->

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -435,6 +435,8 @@ 
    <!-- Permissions required for CTS test - TVInputManagerTest -->

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

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

    <uses-permission android:name="com.android.providers.tv.permission.ACCESS_WATCHED_PROGRAMS" />

    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>



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

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