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

MountService: Check for failure to unmount when enabling UMS and fix reversed logic

Browse Source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat
2010-02-09 13:28:45 -08:00
parent cb72cda8ca
commit 59443a673a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/MountService.java
View File

@@ -177,8 +177,12 @@ class MountService extends IMountService.Stub
String vs = getVolumeState(path);
if (enable && vs.equals(Environment.MEDIA_MOUNTED)) {
mUmsEnabling = enable; // Override for isUsbMassStorageEnabled()
doUnmountVolume(path);
int rc = doUnmountVolume(path);
mUmsEnabling = false; // Clear override
if (rc != StorageResultCode.OperationSucceeded) {
Log.e(TAG, String.format("Failed to unmount before enabling UMS (%d)", rc));
return rc;
}
}
try {
@@ -517,7 +521,7 @@ class MountService extends IMountService.Stub
}
private int doUnmountVolume(String path) {
if (getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) {
if (!getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) {
return VoldResponseCode.OpFailedVolNotMounted;
}