Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9309ff02 authored Feb 21, 2019 by android-build-team Robot

Merge cherrypicks of [6471452, 6471267, 6471268] into qt-release

Change-Id: I16bde9e6a05a04647257061d6b42b7c2b5eaa348

parents b8f412d3 ddfb2596

services/core/java/com/android/server/StorageManagerService.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -3688,8 +3688,17 @@ class StorageManagerService extends IStorageManager.Stub
		} else if (mPmInternal.isInstantApp(packageName, UserHandle.getUserId(uid))) {
		return Zygote.MOUNT_EXTERNAL_NONE;
		} else {
		// STOPSHIP: remove this temporary workaround once developers
		// fix bugs where they're opening _data paths in native code
		switch (packageName) {
		case "com.facebook.katana": // b/123996076
		case "jp.naver.line.android": // b/124767356
		case "com.mxtech.videoplayer.ad": // b/124531483
		return Zygote.MOUNT_EXTERNAL_LEGACY;
		default:
		return Zygote.MOUNT_EXTERNAL_WRITE;
		}
		}
		} catch (RemoteException e) {
		// Should not happen
		}

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}