summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chen Xu <fionaxu@google.com> 2020-05-28 00:24:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-05-28 00:24:30 +0000
commitef0740e227fffa5bd6fce914fb7c8a4b45d431ec (patch)
tree2d68f827754bd7450959a6a1d4c4e4e9aede6c27
parentf37b09335fd9c69c0bacbb6d026961153ddf37f8 (diff)
parent1d4939fff2569bd424f22a0740b20a454396023a (diff)
Merge "support cellbroadcast data migration by dafault" into rvc-dev
-rw-r--r--data/etc/platform.xml1
-rw-r--r--data/etc/privapp-permissions-platform.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 9cd7cc6aedcf..cf312165dd9a 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -249,6 +249,7 @@
<allow-in-data-usage-save package="com.android.providers.downloads" />
<!-- This is a core platform component that needs to freely run in the background -->
+ <allow-in-power-save package="com.android.cellbroadcastreceiver.module" />
<allow-in-power-save package="com.android.cellbroadcastreceiver" />
<allow-in-power-save package="com.android.shell" />
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 8d73f8a94dae..16851cf95435 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -40,7 +40,7 @@ applications that come with the platform
<permission name="android.permission.CRYPT_KEEPER"/>
</privapp-permissions>
- <privapp-permissions package="com.android.cellbroadcastreceiver">
+ <privapp-permissions package="com.android.cellbroadcastreceiver.module">
<permission name="android.permission.INTERACT_ACROSS_USERS"/>
<permission name="android.permission.MANAGE_USERS"/>
<permission name="android.permission.MODIFY_PHONE_STATE"/>