Add dialog to display storage users when enabling/disabling ums
Some error dialogs and related strings
MountService changes to follow unmount path when enabling ums.
Please note that MountService api setUmsEnabled does not return
error codes for now. This is a known limitation.
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index e421ea5..b49979c 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -243,30 +243,24 @@
/**
* Enables USB Mass Storage (UMS) on the device.
- * @return an integer value representing the outcome of the operation.
- * @see android.os.storage.StorageResultCode
*/
- public int enableUsbMassStorage() {
+ public void enableUsbMassStorage() {
try {
- return mMountService.setUsbMassStorageEnabled(true);
+ mMountService.setUsbMassStorageEnabled(true);
} catch (Exception ex) {
Log.e(TAG, "Failed to enable UMS", ex);
}
- return StorageResultCode.OperationFailedInternalError;
}
/**
* Disables USB Mass Storage (UMS) on the device.
- * @return an integer value representing the outcome of the operation.
- * @see android.os.storage.StorageResultCode
*/
- public int disableUsbMassStorage() {
+ public void disableUsbMassStorage() {
try {
- return mMountService.setUsbMassStorageEnabled(false);
+ mMountService.setUsbMassStorageEnabled(false);
} catch (Exception ex) {
Log.e(TAG, "Failed to disable UMS", ex);
}
- return StorageResultCode.OperationFailedInternalError;
}
/**