commit 00c55808f53dcda1bb8ac7c6a7ad6ea455d2c3a8
author Philip P. Moltmann <moltmann@google.com> Fri Sep 13 11:20:34 2019 -0700
committer Philip P. Moltmann <moltmann@google.com> Wed Oct 09 12:57:14 2019 -0700
tree 9270b75ea1fe290bdf0293205bbf2bedc4ee69b3
parent 4121a18568055f1699f93819804a0141e2eaaf9a

Apply changes to get/restore permissions

Bug: 141007569
Test: Via presubmit
Change-Id: I9e5741773962f0e7e0f9446ddbf13a85d2b5ca39

tests/tests/permission2/res/raw/android_manifest.xml

diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index 16ad73f..63c3e57 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -3431,6 +3431,13 @@
     <permission android:name="android.permission.GET_RUNTIME_PERMISSIONS"
         android:protectionLevel="signature" />
 
+    <!-- @SystemApi Allows the system to restore runtime permission state. This might grant
+    permissions, hence this is a more scoped, less powerful variant of GRANT_RUNTIME_PERMISSIONS.
+    Among other restrictions this cannot override user choices.
+    @hide -->
+    <permission android:name="android.permission.RESTORE_RUNTIME_PERMISSIONS"
+                android:protectionLevel="signature" />
+
     <!-- @SystemApi Allows an application to change policy_fixed permissions.
     @hide -->
     <permission android:name="android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY"