diff options
| author | Ken Chen <cken@google.com> | 2021-04-20 08:14:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 08:14:40 +0000 |
| commit | a3e32c8b4ff8f2abdb01cf7046b67a948beba501 (patch) | |
| tree | ec702c0414484c4a688e914a428d1d0bfad4a20d | |
| parent | 2b8dce1db14c39c27767ac63e54e3613e82b75fb (diff) | |
| parent | a96493b7a580b9716cc327273239326e96b584cb (diff) | |
Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" am: 1b06ec2530 am: a96493b7a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675632
Change-Id: I9a94931334fe162c5f05c6c3a1628a41468a2d82
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 4d418c36b50e..460eca2a5a34 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -468,7 +468,7 @@ applications that come with the platform <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" /> <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_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" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 9a3b76fbd653..7b7bec721627 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -391,6 +391,9 @@ <!-- Permission required for testing system audio effect APIs. --> <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 --> <uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" /> <uses-permission android:name="android.permission.ACCESS_TV_TUNER" /> |