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

Merge "Handle stub volumes in StorageSessionController" am: 6341816b31 am: ac9948da15

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d6a220be5413fe6e1222acc753c6e8237e12a21
This commit is contained in:
Treehugger Robot
2021-01-18 13:41:58 +00:00
committed by Automerger Merge Worker
parent 7e54a837d2 ac9948da15
commit f6e84e9ff0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/storage/StorageSessionController.java
View File

@@ -361,7 +361,11 @@ public final class StorageSessionController {
}
}
private static boolean isSupportedVolume(VolumeInfo vol) {
return isEmulatedOrPublic(vol) || vol.type == VolumeInfo.TYPE_STUB;
}
private boolean shouldHandle(@Nullable VolumeInfo vol) {
return mIsFuseEnabled && !mIsResetting && (vol == null || isEmulatedOrPublic(vol));
return mIsFuseEnabled && !mIsResetting && (vol == null || isSupportedVolume(vol));
}
}