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

Merge "resolve merge conflicts of a3e32c8b4f to sc-dev" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-20 13:02:11 +00:00
committed by Android (Google) Code Review
parent 0e7af77f94 e6565f57fc
commit 81b5c878a5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,7 +519,7 @@ applications that come with the platform
<permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" /> <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" />
<permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" /> <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />
<permission name="android.permission.SET_MEDIA_KEY_LISTENER" /> <permission name="android.permission.SET_MEDIA_KEY_LISTENER" />
<permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" /> <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" />
<!-- Permission required for CTS test - CtsAlarmManagerTestCases --> <!-- Permission required for CTS test - CtsAlarmManagerTestCases -->
<permission name="android.permission.UPDATE_DEVICE_STATS" /> <permission name="android.permission.UPDATE_DEVICE_STATS" />
</privapp-permissions> </privapp-permissions>

3
packages/Shell/AndroidManifest.xml
View File

@@ -414,6 +414,9 @@
<!-- Permission required for testing system audio effect APIs. --> <!-- Permission required for testing system audio effect APIs. -->
<uses-permission android:name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/> <uses-permission android:name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/>
<!-- Permission required for running networking unit tests -->
<uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" />
<!-- Permissions required for CTS test - TunerTest --> <!-- Permissions required for CTS test - TunerTest -->
<uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" /> <uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" />
<uses-permission android:name="android.permission.ACCESS_TV_TUNER" /> <uses-permission android:name="android.permission.ACCESS_TV_TUNER" />