From f952e66c1dc9c4dcc92dddbe7d56a0001732f53e Mon Sep 17 00:00:00 2001
From: Varun Shah <varunshah@google.com>
Date: Thu, 25 Jun 2020 11:30:13 -0700
Subject: [PATCH] Update permissions whitelist for calendar provider.

Also allow compat changes in calendar provider to be detected.

Bug: 143231523
Test: atest CalendarProvider2Test
Change-Id: I19caac418223723bb4c7001e12e4311a231f937a
---
 Android.bp                                | 1 +
 data/etc/privapp-permissions-platform.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Android.bp b/Android.bp
index 89a4557fa1cef..1d094b8e7c5b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -568,6 +568,7 @@ java_library {
         "libcore-platform-compat-config",
         "services-platform-compat-config",
         "documents-ui-compat-config",
+        "calendar-provider-compat-config",
     ],
     libs: ["framework-updatable-stubs-module_libs_api"],
     static_libs: [
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 9b503eba5c683..10cb7bbcb42d1 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -198,6 +198,8 @@ applications that come with the platform
         <permission name="android.permission.MANAGE_USERS" />
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
         <permission name="android.permission.USE_RESERVED_DISK"/>
+        <permission name="android.permission.LOG_COMPAT_CHANGE" />
+        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
     </privapp-permissions>
 
     <privapp-permissions package="com.android.providers.contacts">