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

Unmount unusable partition instead of putting device into crashloop.

Browse Source 
Bug: 233902887
Test: presubmit
Change-Id: I91963f4fcde27656e1a253d6181e4d81b02b26fe
Merged-In: I91963f4fcde27656e1a253d6181e4d81b02b26fe
(cherry picked from commit 335f4714bb)
This commit is contained in:
Alex Buynytskyy
2022-05-26 20:52:49 +00:00
committed by Eric Biggers
parent 7507728a6c
commit aba0a55159
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1735,6 +1735,23 @@ class StorageManagerService extends IStorageManager.Stub
}
private void onVolumeStateChangedAsync(VolumeInfo vol, int oldState, int newState) {
if (newState == VolumeInfo.STATE_MOUNTED) {
// Private volumes can be unmounted and re-mounted even after a user has
// been unlocked; on devices that support encryption keys tied to the filesystem,
// this requires setting up the keys again.
try {
prepareUserStorageIfNeeded(vol);
} catch (Exception e) {
// Unusable partition, unmount.
try {
mVold.unmount(vol.id);
} catch (Exception ee) {
Slog.wtf(TAG, ee);
}
return;
}
}
synchronized (mLock) {
// Remember that we saw this volume so we're ready to accept user
// metadata, or so we can annoy them when a private volume is ejected
@@ -1760,13 +1777,6 @@ class StorageManagerService extends IStorageManager.Stub
}
}
if (newState == VolumeInfo.STATE_MOUNTED) {
// Private volumes can be unmounted and re-mounted even after a user has
// been unlocked; on devices that support encryption keys tied to the filesystem,
// this requires setting up the keys again.
prepareUserStorageIfNeeded(vol);
}
// This is a blocking call to Storage Service which needs to process volume state changed
// before notifying other listeners.
// Intentionally called without the mLock to avoid deadlocking from the Storage Service.
@@ -3355,7 +3365,7 @@ class StorageManagerService extends IStorageManager.Stub
}
}
private void prepareUserStorageIfNeeded(VolumeInfo vol) {
private void prepareUserStorageIfNeeded(VolumeInfo vol) throws Exception {
if (vol.type != VolumeInfo.TYPE_PRIVATE) {
return;
}
@@ -3382,11 +3392,15 @@ class StorageManagerService extends IStorageManager.Stub
public void prepareUserStorage(String volumeUuid, int userId, int serialNumber, int flags) {
enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
prepareUserStorageInternal(volumeUuid, userId, serialNumber, flags);
try {
prepareUserStorageInternal(volumeUuid, userId, serialNumber, flags);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
private void prepareUserStorageInternal(String volumeUuid, int userId, int serialNumber,
int flags) {
int flags) throws Exception {
try {
mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);
// After preparing user storage, we should check if we should mount data mirror again,
@@ -3413,7 +3427,7 @@ class StorageManagerService extends IStorageManager.Stub
+ "; device may be insecure!");
return;
}
throw new RuntimeException(e);
throw e;
}
}