diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-04 15:25:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 15:25:21 -0700 |
| commit | 8f7aad147d790b25bae7301827e070df72690341 (patch) | |
| tree | edb2ab4d3ccdd8a0d5064071837614e4fbe9172b /services | |
| parent | 549177e4f3f5e2a92e1431c157cebb985068a5ee (diff) | |
| parent | f7a34b15986f8c00bc6fb941a40f9acbe2c21aff (diff) | |
| download | frameworks_base-8f7aad147d790b25bae7301827e070df72690341.zip frameworks_base-8f7aad147d790b25bae7301827e070df72690341.tar.gz frameworks_base-8f7aad147d790b25bae7301827e070df72690341.tar.bz2 | |
am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
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 91ada6b..a34b7dc 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1532,7 +1532,8 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC } 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)); } |