Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f9379
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190244 Change-Id: Ia6a83ab5f43fb43427641d20529659a886b17d18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -904,14 +904,6 @@ final class DefaultPermissionGrantPolicy {
|
|||||||
COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);
|
COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Attention Service
|
|
||||||
String attentionServicePackageName =
|
|
||||||
mContext.getPackageManager().getAttentionServicePackageName();
|
|
||||||
if (!TextUtils.isEmpty(attentionServicePackageName)) {
|
|
||||||
grantPermissionsToSystemPackage(pm, attentionServicePackageName, userId,
|
|
||||||
CAMERA_PERMISSIONS);
|
|
||||||
}
|
|
||||||
|
|
||||||
// There is no real "marker" interface to identify the shared storage backup, it is
|
// There is no real "marker" interface to identify the shared storage backup, it is
|
||||||
// hardcoded in BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE.
|
// hardcoded in BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE.
|
||||||
grantSystemFixedPermissionsToSystemPackage(pm, "com.android.sharedstoragebackup", userId,
|
grantSystemFixedPermissionsToSystemPackage(pm, "com.android.sharedstoragebackup", userId,
|
||||||
|
|||||||
Reference in New Issue
Block a user