Merge "Remove manual pregrants for ContentCaptureService (now handled via roles)" into tm-dev am: 18a113c42d am: 36c85684c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769071 Change-Id: I060bd9906825e4ad0c77761d543355013402c92a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -903,15 +903,6 @@ final class DefaultPermissionGrantPolicy {
|
||||
COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);
|
||||
}
|
||||
|
||||
// Content capture
|
||||
String contentCapturePackageName =
|
||||
mContext.getPackageManager().getContentCaptureServicePackageName();
|
||||
if (!TextUtils.isEmpty(contentCapturePackageName)) {
|
||||
grantPermissionsToSystemPackage(pm, contentCapturePackageName, userId,
|
||||
PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
|
||||
CONTACTS_PERMISSIONS, STORAGE_PERMISSIONS);
|
||||
}
|
||||
|
||||
// Attention Service
|
||||
String attentionServicePackageName =
|
||||
mContext.getPackageManager().getAttentionServicePackageName();
|
||||
|
||||
Reference in New Issue
Block a user