Merge "Remove manual pregrants for ContentCaptureService (now handled via roles)" into tm-dev

This commit is contained in:
Nikita Dubrovsky
2022-04-21 19:12:26 +00:00
committed by Android (Google) Code Review

View File

@@ -903,15 +903,6 @@ final class DefaultPermissionGrantPolicy {
COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS); 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 // Attention Service
String attentionServicePackageName = String attentionServicePackageName =
mContext.getPackageManager().getAttentionServicePackageName(); mContext.getPackageManager().getAttentionServicePackageName();