diff options
| author | Kenny Root <kroot@google.com> | 2010-09-30 18:06:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 18:06:02 -0700 |
| commit | 8d85beca80f0c84344ffb527ec7cab0ca7b53d4f (patch) | |
| tree | 4359f2718e67adce2c97057e9714545c8b3f64ed | |
| parent | c38e6ae40096ec60bc42de663f39dc061b9c90f4 (diff) | |
| parent | 8b28441adab59f2bb0d92c8a717af75331249e08 (diff) | |
| download | frameworks_base-8d85beca80f0c84344ffb527ec7cab0ca7b53d4f.zip frameworks_base-8d85beca80f0c84344ffb527ec7cab0ca7b53d4f.tar.gz frameworks_base-8d85beca80f0c84344ffb527ec7cab0ca7b53d4f.tar.bz2 | |
am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '8b28441adab59f2bb0d92c8a717af75331249e08' into gingerbread-plus-aosp
* commit '8b28441adab59f2bb0d92c8a717af75331249e08':
Being already unmounted is not a failure
| -rw-r--r-- | services/java/com/android/server/MountService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index f47e78a..0910e53 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -2062,6 +2062,9 @@ class MountService extends IMountService.Stub int code = e.getCode(); if (code == VoldResponseCode.OpFailedStorageBusy) { rc = StorageResultCode.OperationFailedStorageBusy; + } else if (code == VoldResponseCode.OpFailedStorageNotFound) { + // If it's not mounted then we've already won. + rc = StorageResultCode.OperationSucceeded; } else { rc = StorageResultCode.OperationFailedInternalError; } |