commit 81b3107d48933e81d8149988ff35de2aa5510681
author Rebecca Silberstein <silberst@google.com> Thu Aug 24 22:47:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 24 22:47:29 2017 +0000
tree af6b103cf64b854f8a722d19214d0d604c18481b
parent 54c6447f47c212006e3b9d0f72a32246b9260399
parent d3428e9a3b80b6c2f7e0b866c72d15d107fe2a9b

Merge "Add wifi permissions to shell" into oc-mr1-dev
am: d3428e9a3b

Change-Id: I4aa82e6a8a9e9a11415e3020d6508a83cdfb453e

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 2446775..bd1ebb9 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -118,6 +118,8 @@
     <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
     <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
     <uses-permission android:name="android.permission.MANAGE_AUTO_FILL" />
+    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <!-- Permission needed to rename bugreport notifications (so they're not shown as Shell) -->
     <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
     <!-- Permission needed to hold a wakelock in dumpstate.cpp (drop_root_user()) -->