Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If58599b99b81fb0a5272c02ee16354b697156c47
This commit is contained in:
TreeHugger Robot
2021-06-28 11:21:46 +00:00
committed by Automerger Merge Worker
parent cf34b4c12f 7058f9948f
commit 849af2a984
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/etc/privapp-permissions-platform.xml
View File

@@ -428,6 +428,8 @@ applications that come with the platform
<!-- Permissions required for CTS test - TVInputManagerTest --> <!-- Permissions required for CTS test - TVInputManagerTest -->
<permission name="android.permission.ACCESS_TUNED_INFO" /> <permission name="android.permission.ACCESS_TUNED_INFO" />
<permission name="android.permission.TV_INPUT_HARDWARE" /> <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 required for CTS test - PrivilegedLocationPermissionTest -->
<permission name="android.permission.LOCATION_HARDWARE" /> <permission name="android.permission.LOCATION_HARDWARE" />
<!-- Permissions required for GTS test - GtsDialerAudioTestCases --> <!-- Permissions required for GTS test - GtsDialerAudioTestCases -->

2
packages/Shell/AndroidManifest.xml
View File

@@ -435,6 +435,8 @@
<!-- Permissions required for CTS test - TVInputManagerTest --> <!-- Permissions required for CTS test - TVInputManagerTest -->
<uses-permission android:name="android.permission.ACCESS_TUNED_INFO" /> <uses-permission android:name="android.permission.ACCESS_TUNED_INFO" />
<uses-permission android:name="android.permission.TV_INPUT_HARDWARE" /> <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 --> <!-- Permission needed for CTS test - PrivilegedLocationPermissionTest -->
<uses-permission android:name="android.permission.LOCATION_HARDWARE" /> <uses-permission android:name="android.permission.LOCATION_HARDWARE" />