commit 5dbabb62a61ccf068bff032d7db0f8c13842b34c
author Paul Murphy <paulmur@google.com> Sat Feb 29 23:42:23 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 29 23:42:23 2020 +0000
tree f1466204054a0d7d59066ba8749e353ab691827c
parent d03d6628e4d79c3ccf48c714d7814c2c7af52380
parent 1460b76a02e6b22ebf79f0ab177a3061efdf517f

Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 78c7b76d..73d9cc0 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -386,6 +386,8 @@
         <permission name="android.permission.ACCESS_VIBRATOR_STATE"/>
         <!-- Permission required for UsageStatsTest CTS test. -->
         <permission name="android.permission.MANAGE_NOTIFICATIONS"/>
+        <!-- Permission required for CompanionDeviceManager CTS test. -->
+        <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" />
     </privapp-permissions>
 
     <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 99f8c7d..56d5de4 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -192,7 +192,10 @@
     <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />
     <!-- Permission needed to wipe the device for Test Harness Mode -->
     <uses-permission android:name="android.permission.ENABLE_TEST_HARNESS_MODE" />
+
+    <!-- Permissions required to test CompanionDeviceManager teses in CTS -->
     <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
+    <uses-permission android:name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" />
 
     <uses-permission android:name="android.permission.MANAGE_APPOPS" />