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

Improve secondary volume mounts on user switch

Browse Source 
Ic1226229d377d7106bd78798a03adfc9b7f2efb6 fixed the secondary volume
mounts on user switch but there some issues when switching to a user
that is not yet unlocked because the ExternalStorageService for the
user might not yet be ready.

Now, we fix this by checking if the user is unlocked and delaying the
remount till after unlock in such cases

Test: Manual
Bug: 183686263
Change-Id: I7c885b0c3e6cefe23ba405710c2a50ad957bff5c
This commit is contained in:
Zim
2021-05-18 10:41:39 +01:00
committed by Zimuzo Ezeozue
parent 225ffc92e1
commit 96c1d7d550
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,9 +248,18 @@ 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);
int currentUserId = to.getUserIdentifier();
mStorageManagerService.mCurrentUserId = currentUserId;
UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);
if (umInternal.isUserUnlocked(currentUserId)) {
Slog.d(TAG, "Attempt remount volumes for user: " + currentUserId);
mStorageManagerService.maybeRemountVolumes(currentUserId);
mStorageManagerService.mRemountCurrentUserVolumesOnUnlock = false;
} else {
Slog.d(TAG, "Attempt remount volumes for user: " + currentUserId + " on unlock");
mStorageManagerService.mRemountCurrentUserVolumesOnUnlock = true;
}
}
@Override
@@ -425,6 +434,8 @@ class StorageManagerService extends IStorageManager.Stub
private volatile int mCurrentUserId = UserHandle.USER_SYSTEM;
private volatile boolean mRemountCurrentUserVolumesOnUnlock = false;
private final Installer mInstaller;
/** Holding lock for AppFuse business */
@@ -1196,6 +1207,10 @@ class StorageManagerService extends IStorageManager.Stub
}
mHandler.obtainMessage(H_COMPLETE_UNLOCK_USER, userId).sendToTarget();
if (mRemountCurrentUserVolumesOnUnlock && userId == mCurrentUserId) {
maybeRemountVolumes(userId);
mRemountCurrentUserVolumesOnUnlock = false;
}
}
private void completeUnlockUser(int userId) {
@@ -1255,7 +1270,7 @@ class StorageManagerService extends IStorageManager.Stub
}
}
private void onUserSwitching(int userId) {
private void maybeRemountVolumes(int userId) {
boolean reset = false;
List<VolumeInfo> volumesToRemount = new ArrayList<>();
synchronized (mLock) {
@@ -1272,6 +1287,7 @@ class StorageManagerService extends IStorageManager.Stub
}
for (VolumeInfo vol : volumesToRemount) {
Slog.i(TAG, "Remounting volume for user: " + userId + ". Volume: " + vol);
mHandler.obtainMessage(H_VOLUME_UNMOUNT, vol).sendToTarget();
mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
}