am a6c28cb0: am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"

Merge commit 'a6c28cb014c32b9522c41385075c9db77296f6e7'

* commit 'a6c28cb014c32b9522c41385075c9db77296f6e7':
  Fix isUsbMassStorageConnected() will always return true

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

@@ -1013,7 +1013,7 @@ class MountService extends IMountService.Stub
 
     private void setUmsEnabling(boolean enable) {
         synchronized (mListeners) {
-            mUmsEnabling = true;
+            mUmsEnabling = enable;
         }
     }