diff options
| author | 2019-04-01 14:14:03 -0700 | |
|---|---|---|
| committer | 2019-04-01 14:14:03 -0700 | |
| commit | e53008bed5a575e4b8d7fe758177e457c19fbb8c (patch) | |
| tree | 6164811aa46f4eee24f2c8f49318c53883772288 | |
| parent | 9e1d425b587ddab912623ec69ceeed8e040e18e7 (diff) | |
| parent | 7e3864bc993c862673ab341bd265e639e1f3b155 (diff) | |
Merge changes from topics "nw-scan-cts", "nw-scan-changes" am: f276a56215
am: 7e3864bc99
Change-Id: I45112b415f0f1d6a991b65a2f87c04f829a13548
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index d44f5a934280..28099a16cda5 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -261,6 +261,7 @@ applications that come with the platform <permission name="android.permission.MOUNT_FORMAT_FILESYSTEMS"/> <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <permission name="android.permission.MOVE_PACKAGE"/> + <permission name="android.permission.NETWORK_SCAN"/> <permission name="android.permission.PACKAGE_USAGE_STATS" /> <!-- Needed for test only --> <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD" /> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 8778e30e0498..7804498a2c3f 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -118,6 +118,8 @@ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> <uses-permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS" /> <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" /> + <!-- Shell only holds android.permission.NETWORK_SCAN in order to to enable CTS testing --> + <uses-permission android:name="android.permission.NETWORK_SCAN" /> <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" /> <uses-permission android:name="android.permission.REGISTER_CONNECTION_MANAGER" /> <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" /> |