commit e244583ef0a76893a873be4f9259832bacca714a
author Hai Zhang <zhanghai@google.com> Fri Jan 31 17:06:45 2020 -0800
committer Hai Zhang <zhanghai@google.com> Mon Feb 03 13:05:28 2020 -0800
tree 315b44d2514b8a9d4b253991612b8fa79df87f71
parent b1b1204a7ab256678ce94e2c42f264a94db56494

Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing.

Bug: 136503238
Test: presubmit
Merged-In: I7e40296120e18f2dfbbf04b5ae9d148724afa920
Change-Id: I7e40296120e18f2dfbbf04b5ae9d148724afa920

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 09eece8..08d89ba 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -227,6 +227,9 @@
     <uses-permission android:name="android.permission.READ_DREAM_STATE"/>
     <uses-permission android:name="android.permission.WRITE_DREAM_STATE"/>
 
+    <!-- Permission needed to test mainline permission module rollback -->
+    <uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" />
+
     <application android:label="@string/app_label"
                 android:theme="@android:style/Theme.DeviceDefault.DayNight"
                 android:defaultToDeviceProtectedStorage="true"