Merge "Public volumes belong to a single user." into mnc-dev (34849c22) · Commits · e / os / android_frameworks_base

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,8 @@ public class ExternalStorageProvider extends DocumentsProvider {
		final VolumeInfo privateVol = mStorageManager.findPrivateForEmulated(volume);
		title = mStorageManager.getBestVolumeDescription(privateVol);
		}
		} else if (volume.getType() == VolumeInfo.TYPE_PUBLIC) {
		} else if (volume.getType() == VolumeInfo.TYPE_PUBLIC
		&& volume.getMountUserId() == userId) {
		rootId = volume.getFsUuid();
		title = mStorageManager.getBestVolumeDescription(volume);
		} else {

+8 −1

Original line number	Diff line number	Diff line
		@@ -168,6 +168,11 @@ class MountService extends IMountService.Stub
		}
		}

		@Override
		public void onSwitchUser(int userHandle) {
		mMountService.mCurrentUserId = userHandle;
		}

		@Override
		public void onStartUser(int userHandle) {
		mMountService.onStartUser(userHandle);
		@@ -307,6 +312,8 @@ class MountService extends IMountService.Stub
		@GuardedBy("mLock")
		private String mMoveTargetUuid;

		private volatile int mCurrentUserId = UserHandle.USER_OWNER;

		private VolumeInfo findVolumeByIdOrThrow(String id) {
		synchronized (mLock) {
		final VolumeInfo vol = mVolumes.get(id);
		@@ -1183,7 +1190,7 @@ class MountService extends IMountService.Stub
		vol.mountFlags \|= VolumeInfo.MOUNT_FLAG_VISIBLE;
		}

		vol.mountUserId = UserHandle.USER_OWNER;
		vol.mountUserId = mCurrentUserId;
		mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();

		} else if (vol.type == VolumeInfo.TYPE_PRIVATE) {