Merge "Fixing Storage Volume listing for Cloned User." into tm-qpr-dev (95580435) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/StorageManager.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -2555,6 +2555,8 @@ public class StorageManager {
		* This API doesn't require any special permissions, though typical implementations
		* will require being called from an SELinux domain that allows setting file attributes
		* related to quota (eg the GID or project ID).
		* If the calling user has MANAGE_EXTERNAL_STORAGE permissions, quota for shared profile's
		* volumes is also updated.
		*
		* The default platform user of this API is the MediaProvider process, which is
		* responsible for managing all of external storage.
		@@ -2575,7 +2577,14 @@ public class StorageManager {
		@QuotaType int quotaType) throws IOException {
		long projectId;
		final String filePath = path.getCanonicalPath();
		final StorageVolume volume = getStorageVolume(path);
		int volFlags = FLAG_REAL_STATE \| FLAG_INCLUDE_INVISIBLE;
		// If caller has MANAGE_EXTERNAL_STORAGE permission, results from User Profile(s) are also
		// returned by enabling FLAG_INCLUDE_SHARED_PROFILE.
		if (mContext.checkSelfPermission(MANAGE_EXTERNAL_STORAGE) == PERMISSION_GRANTED) {
		volFlags \|= FLAG_INCLUDE_SHARED_PROFILE;
		}
		final StorageVolume[] availableVolumes = getVolumeList(mContext.getUserId(), volFlags);
		final StorageVolume volume = getStorageVolume(availableVolumes, path);
		if (volume == null) {
		Log.w(TAG, "Failed to update quota type for " + filePath);
		return;

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

+14 −9

Original line number	Diff line number	Diff line
		@@ -3813,6 +3813,13 @@ class StorageManagerService extends IStorageManager.Stub
		final boolean includeSharedProfile =
		(flags & StorageManager.FLAG_INCLUDE_SHARED_PROFILE) != 0;

		// When the caller is the app actually hosting external storage, we
		// should never attempt to augment the actual storage volume state,
		// otherwise we risk confusing it with race conditions as users go
		// through various unlocked states
		final boolean callerIsMediaStore = UserHandle.isSameApp(callingUid,
		mMediaStoreAuthorityAppId);

		// Only Apps with MANAGE_EXTERNAL_STORAGE should call the API with includeSharedProfile
		if (includeSharedProfile) {
		try {
		@@ -3825,7 +3832,12 @@ class StorageManagerService extends IStorageManager.Stub
		// Checking first entry in packagesFromUid is enough as using "sharedUserId"
		// mechanism is rare and discouraged. Also, Apps that share same UID share the same
		// permissions.
		if (!mStorageManagerInternal.hasExternalStorageAccess(callingUid,
		// Allowing Media Provider is an exception, Media Provider process should be allowed
		// to query users across profiles, even without MANAGE_EXTERNAL_STORAGE access.
		// Note that ordinarily Media provider process has the above permission, but if they
		// are revoked, Storage Volume(s) should still be returned.
		if (!callerIsMediaStore
		&& !mStorageManagerInternal.hasExternalStorageAccess(callingUid,
		packagesFromUid[0])) {
		throw new SecurityException("Only File Manager Apps permitted");
		}
		@@ -3839,13 +3851,6 @@ class StorageManagerService extends IStorageManager.Stub
		// point
		final boolean systemUserUnlocked = isSystemUnlocked(UserHandle.USER_SYSTEM);

		// When the caller is the app actually hosting external storage, we
		// should never attempt to augment the actual storage volume state,
		// otherwise we risk confusing it with race conditions as users go
		// through various unlocked states
		final boolean callerIsMediaStore = UserHandle.isSameApp(callingUid,
		mMediaStoreAuthorityAppId);

		final boolean userIsDemo;
		final boolean userKeyUnlocked;
		final boolean storagePermission;