commit 6c681056bbceabbc56f2a82edc64060c4eb4bf3a
author Marcus Hagerott <mhagerott@google.com> Fri Nov 12 17:48:47 2021 -0800
committer Marcus Hagerott <mhagerott@google.com> Tue Nov 16 13:40:41 2021 -0800
tree f87c6078b0dbbe916de3397878d586fccef4b3cb
parent b636aacf1d9694b1be3bdc3188b1dc51dcbb93e1

Allow ContactsProvider to use compat change framework

BUG=188347648
Test: m droid

Change-Id: Ifb6675777c76ca1c44af96ceb02a6207d28bd045

Android.bp

diff --git a/Android.bp b/Android.bp
index 3d087c0..3686053 100644
--- a/Android.bp
+++ b/Android.bp
@@ -328,6 +328,7 @@
         "TeleService-platform-compat-config",
         "documents-ui-compat-config",
         "calendar-provider-compat-config",
+        "contacts-provider-platform-compat-config",
     ],
     libs: [
         "app-compat-annotations",

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index cf072b4..e81adec 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -225,6 +225,8 @@
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
         <permission name="android.permission.USE_RESERVED_DISK"/>
+        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
+        <permission name="android.permission.LOG_COMPAT_CHANGE" />
     </privapp-permissions>
 
     <privapp-permissions package="com.android.providers.downloads">