commit f952e66c1dc9c4dcc92dddbe7d56a0001732f53e
author Varun Shah <varunshah@google.com> Thu Jun 25 11:30:13 2020 -0700
committer Varun Shah <varunshah@google.com> Fri Jun 26 11:23:05 2020 -0700
tree 857732b9e121961c29f077f7505c582abb318ad1
parent 1d9d0b9dac17d3275c19d916acf375ad129abe0d

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

diff --git a/Android.bp b/Android.bp
index 89a4557..1d094b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -568,6 +568,7 @@
         "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: [

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 9b503eb..10cb7bb 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -198,6 +198,8 @@
         <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">