From ddb4902597df7beb978a20a2299b784e2d9c5c6f Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Wed, 9 Dec 2020 21:22:16 -0800
Subject: [PATCH] Grant shell permissions for Airplane Mode to Shell to support
 CTS

New permission is needed to allow CTS to trigger the new WiFi subsystem
restart API.

Bug: 175084231
Test: atest android.net.wifi.cts.WifiManagerTest#testRestartWifiSubsystem
Change-Id: Id844fb799c61f65580e686d1da7ec38a62dd01d0
---
 data/etc/privapp-permissions-platform.xml | 2 ++
 packages/Shell/AndroidManifest.xml        | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 057c0120b6855..f9a0689a62c51 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -343,6 +343,8 @@ 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"/>
+        <!-- Needed for test only -->
+        <permission name="android.permission.NETWORK_AIRPLANE_MODE"/>
         <permission name="android.permission.OBSERVE_APP_USAGE"/>
         <permission name="android.permission.NETWORK_SCAN"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS" />
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 0fdb282edc232..ea20be7fd9eba 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -290,6 +290,9 @@
     <!-- Permission needed to test mainline permission module rollback -->
     <uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" />
 
+    <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->
+    <uses-permission android:name="android.permission.NETWORK_AIRPLANE_MODE" />
+
     <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->
     <uses-permission android:name="android.permission.READ_WIFI_CREDENTIAL" />