commit db5cbbf21c2bf9a879affc6020a564bd3a80b044
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 27 15:34:22 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 27 15:34:22 2020 +0000
tree d656669f5a5c9d9ef7ea435195246e75f777a646
parent 71d0cb01914c6ab52545d9608f0b65b2b8d156b9
parent 3cb1cbdcfd036dd77ef338ba5618bde91480ccf1

Merge "Add PlatformCompat feature for DocumentUI" into rvc-dev

Android.bp

diff --git a/Android.bp b/Android.bp
index 4a1f96e..5e068ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -481,6 +481,7 @@
         "framework-platform-compat-config",
         "libcore-platform-compat-config",
         "services-platform-compat-config",
+        "documents-ui-compat-config",
     ],
     static_libs: [
         // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

data/etc/com.android.documentsui.xml

diff --git a/data/etc/com.android.documentsui.xml b/data/etc/com.android.documentsui.xml
index 0ffaa21..b6671db 100644
--- a/data/etc/com.android.documentsui.xml
+++ b/data/etc/com.android.documentsui.xml
@@ -18,6 +18,8 @@
     <privapp-permissions package="com.android.documentsui">
         <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MODIFY_QUIET_MODE"/>
+        <!-- Permissions required for reading and logging compat changes -->
+        <permission name="android.permission.LOG_COMPAT_CHANGE"/>
+        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>
     </privapp-permissions>
 </permissions>