Merge "Fix secondary volume mounts on user switch" into sc-dev (bda154d5) · Commits · e / os / android_frameworks_base

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,8 @@ class StorageManagerService extends IStorageManager.Stub
		@Override
		public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
		mStorageManagerService.mCurrentUserId = to.getUserIdentifier();
		// To reset public volume mounts
		mStorageManagerService.onUserSwitching(mStorageManagerService.mCurrentUserId);
		}

		@Override
		@@ -1218,6 +1220,28 @@ class StorageManagerService extends IStorageManager.Stub
		}
		}

		private void onUserSwitching(int userId) {
		boolean reset = false;
		List<VolumeInfo> volumesToRemount = new ArrayList<>();
		synchronized (mLock) {
		for (int i = 0; i < mVolumes.size(); i++) {
		final VolumeInfo vol = mVolumes.valueAt(i);
		if (!vol.isPrimary() && vol.isMountedWritable() && vol.isVisible()
		&& vol.getMountUserId() != mCurrentUserId) {
		// If there's a visible secondary volume mounted,
		// we need to update the currentUserId and remount
		vol.mountUserId = mCurrentUserId;
		volumesToRemount.add(vol);
		}
		}
		}

		for (VolumeInfo vol : volumesToRemount) {
		mHandler.obtainMessage(H_VOLUME_UNMOUNT, vol).sendToTarget();
		mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
		}
		}

		private boolean supportsBlockCheckpoint() throws RemoteException {
		enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);
		return mVold.supportsBlockCheckpoint();