diff options
| author | Kenny Root <kroot@google.com> | 2010-03-19 19:20:42 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-03-22 13:08:52 -0700 |
| commit | f030462c83a91432b7cf2c699778b63b1e79de72 (patch) | |
| tree | 4e46b130f6a1d6f620ae6186c6c56a0658948fdf /services/java/com/android/server/MountService.java | |
| parent | a990ef3abf91ef78ba43da48e0ba702aca293ecc (diff) | |
| download | frameworks_base-f030462c83a91432b7cf2c699778b63b1e79de72.zip frameworks_base-f030462c83a91432b7cf2c699778b63b1e79de72.tar.gz frameworks_base-f030462c83a91432b7cf2c699778b63b1e79de72.tar.bz2 | |
Make trying to remount an asec container non-fatal
If an asec container is already mounted for some reason, start tracking
it in the MountService's internal state and tell the caller we had
success mounting the secure container.
Change-Id: I5bb0f84b2bafc0cd2dba248c35a8d68fd53ef1b2
Diffstat (limited to 'services/java/com/android/server/MountService.java')
| -rw-r--r-- | services/java/com/android/server/MountService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index d3ac026..a4703de 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1203,7 +1203,10 @@ class MountService extends IMountService.Stub try { mConnector.doCommand(cmd); } catch (NativeDaemonConnectorException e) { - rc = StorageResultCode.OperationFailedInternalError; + int code = e.getCode(); + if (code != VoldResponseCode.OpFailedStorageBusy) { + rc = StorageResultCode.OperationFailedInternalError; + } } if (rc == StorageResultCode.OperationSucceeded) { |