diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-04 10:17:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 10:17:35 -0700 |
| commit | f7a34b15986f8c00bc6fb941a40f9acbe2c21aff (patch) | |
| tree | eeda29222889d2dc6013e76a57d4ed6ee1d274d0 /services | |
| parent | 92d72ca01ba1c9e6cfed318a86287ffd0cc2c385 (diff) | |
| parent | e558a0000389a2523b8d3d3a787db6b4579d2bdc (diff) | |
| download | frameworks_base-f7a34b15986f8c00bc6fb941a40f9acbe2c21aff.zip frameworks_base-f7a34b15986f8c00bc6fb941a40f9acbe2c21aff.tar.gz frameworks_base-f7a34b15986f8c00bc6fb941a40f9acbe2c21aff.tar.bz2 | |
am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/MountService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index e6e3e5f..4d934b6 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1509,7 +1509,8 @@ class MountService extends IMountService.Stub } catch (NativeDaemonConnectorException e) { int code = e.getCode(); if (code == VoldResponseCode.OpFailedStorageNotFound) { - throw new IllegalArgumentException(String.format("Container '%s' not found", id)); + Slog.i(TAG, String.format("Container '%s' not found", id)); + return null; } else { throw new IllegalStateException(String.format("Unexpected response code %d", code)); } |