summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-04-04 15:28:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-04 15:28:48 -0700
commit37334c0f34ef40735b9f44918b53c1469ceae2cc (patch)
tree3629b74d86d3d93bcf2c0e805693e3482750ec91 /services
parent38a1345b8dc59a8acbaa9013b4ddb2efc6dc6afe (diff)
parent8f7aad147d790b25bae7301827e070df72690341 (diff)
downloadframeworks_base-37334c0f34ef40735b9f44918b53c1469ceae2cc.zip
frameworks_base-37334c0f34ef40735b9f44918b53c1469ceae2cc.tar.gz
frameworks_base-37334c0f34ef40735b9f44918b53c1469ceae2cc.tar.bz2
am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
* commit '8f7aad147d790b25bae7301827e070df72690341': Avoid crash in system server when mounting container
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/MountService.java3
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 4e80147..d407268 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -1534,7 +1534,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));
}