From 6c681056bbceabbc56f2a82edc64060c4eb4bf3a Mon Sep 17 00:00:00 2001
From: Marcus Hagerott <mhagerott@google.com>
Date: Fri, 12 Nov 2021 17:48:47 -0800
Subject: [PATCH] Allow ContactsProvider to use compat change framework

BUG=188347648
Test: m droid

Change-Id: Ifb6675777c76ca1c44af96ceb02a6207d28bd045
---
 Android.bp                                | 1 +
 data/etc/privapp-permissions-platform.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Android.bp b/Android.bp
index 3d087c08677f..3686053f14fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -328,6 +328,7 @@ java_defaults {
         "TeleService-platform-compat-config",
         "documents-ui-compat-config",
         "calendar-provider-compat-config",
+        "contacts-provider-platform-compat-config",
     ],
     libs: [
         "app-compat-annotations",
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index cf072b488efc..e81adecc3bad 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -225,6 +225,8 @@ applications that come with the platform
         <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">