commit 59443a673a736978361dc341f41ce4e9dae053a0
author San Mehat <san@google.com> Tue Feb 09 13:28:45 2010 -0800
committer San Mehat <san@google.com> Tue Feb 09 13:28:45 2010 -0800
tree 2035b24014a356ad0f39cce16a63d977d2e903d1
parent cb72cda8ca3669dfcbe71d1ac6c5e6c264ff5faa

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

Signed-off-by: San Mehat <san@google.com>

services/java/com/android/server/MountService.java

diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index 6de2eff..8d45033 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -177,8 +177,12 @@
         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 @@
     }
 
     private int doUnmountVolume(String path) {
-        if (getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) {
+        if (!getVolumeState(path).equals(Environment.MEDIA_MOUNTED)) {
             return VoldResponseCode.OpFailedVolNotMounted;
         }