Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "improvements of CBR on compainion devices" into sc-dev am: 9b03c1c496 am: 3318f3af4a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14940430

Change-Id: I641371ba26e218f4cd186abeb4425558c3b3d01b
This commit is contained in:
Chen Xu
2021-06-23 23:39:54 +00:00
committed by Automerger Merge Worker
parent 6d6b8099c1 3318f3af4a
commit ac52a3a921
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
View File

@@ -641,7 +641,7 @@ final class DefaultPermissionGrantPolicy {
// Cell Broadcast Receiver // Cell Broadcast Receiver
grantSystemFixedPermissionsToSystemPackage(pm, grantSystemFixedPermissionsToSystemPackage(pm,
getDefaultSystemHandlerActivityPackage(pm, Intents.SMS_CB_RECEIVED_ACTION, userId), getDefaultSystemHandlerActivityPackage(pm, Intents.SMS_CB_RECEIVED_ACTION, userId),
userId, SMS_PERMISSIONS); userId, SMS_PERMISSIONS, NEARBY_DEVICES_PERMISSIONS);
// Carrier Provisioning Service // Carrier Provisioning Service
grantPermissionsToSystemPackage(pm, grantPermissionsToSystemPackage(pm,