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

Merge "Fix secondary volume mounts on user switch" into sc-dev

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2021-04-06 14:18:50 +00:00
committed by Android (Google) Code Review
parent 7d0422a7ca bf00e70426
commit bda154d565
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -249,6 +249,8 @@ class StorageManagerService extends IStorageManager.Stub
@Override @Override
public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) { public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
mStorageManagerService.mCurrentUserId = to.getUserIdentifier(); mStorageManagerService.mCurrentUserId = to.getUserIdentifier();
// To reset public volume mounts
mStorageManagerService.onUserSwitching(mStorageManagerService.mCurrentUserId);
} }
@Override @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 { private boolean supportsBlockCheckpoint() throws RemoteException {
enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);
return mVold.supportsBlockCheckpoint(); return mVold.supportsBlockCheckpoint();