From: Felipe Leme <felipeal@google.com>
Date: Wed, 14 Feb 2018 21:15:19 +0000 (-0800)
Subject: Add android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS
X-Git-Tag: android-x86-9.0-r1~95^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a5bbad439ce347a371b77c3cf1269a8e48c5a12c;p=android-x86%2Fpackages-apps-Settings.git

Add android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS

This permission is required to access the ScopedAccessProvider. Although
Settings doesn't currently needs it because it has implicit access because
it runs as UID 1000, it's better to explicitly grant it.

Bug: 72055774

Test: atest CtsAppSecurityHostTestCases:ScopedDirectoryAccessTest#testResetDoNotAskAgain,testResetGranted

Change-Id: I843d7e4a1f674b4e012ac7f744d6ffccadde5a24
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dec12ba4e5..0d556f8eaa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,6 +92,7 @@
     <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
     <uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
     <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
+    <uses-permission android:name="android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS" />
 
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"