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

Merge "Temporary workaround to grant Storage permission."

Browse Source
This commit is contained in:
Jeff Sharkey
2019-02-20 23:59:05 +00:00
committed by Android (Google) Code Review
parent a56a9e2dd1 3805e94129
commit 788f3a09ba
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -642,10 +642,16 @@ public final class DefaultPermissionGrantPolicy {
// Location
if (locationPackageNames != null) {
for (String packageName : locationPackageNames) {
// STOPSHIP: remove this force-granting of legacy storage
// permissions once b/124466734 is resolved
final Set<String> storageWorkaround = new ArraySet<>();
storageWorkaround.add(Manifest.permission.READ_EXTERNAL_STORAGE);
storageWorkaround.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
grantPermissionsToSystemPackage(packageName, userId,
CONTACTS_PERMISSIONS, CALENDAR_PERMISSIONS, MICROPHONE_PERMISSIONS,
PHONE_PERMISSIONS, SMS_PERMISSIONS, CAMERA_PERMISSIONS,
SENSORS_PERMISSIONS, STORAGE_PERMISSIONS, MEDIA_AURAL_PERMISSIONS);
SENSORS_PERMISSIONS, STORAGE_PERMISSIONS, storageWorkaround);
grantSystemFixedPermissionsToSystemPackage(packageName, userId,
LOCATION_PERMISSIONS, ACTIVITY_RECOGNITION_PERMISSIONS);
}