summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2015-01-09 19:21:24 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-09 19:21:24 +0000
commit0cb736f754d8f487ebe4c8cc670e5dd2589eaea1 (patch)
tree6e6a19679b95dab9e9cbef300d13e933c68b7db0
parenta319aa800df36d40e1de453b64fd1e14573e6d80 (diff)
parent2b46774ff950270365238e12e4a336e2004500e2 (diff)
am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
* commit '2b46774ff950270365238e12e4a336e2004500e2': Guard against MountService throwing NPE.
-rw-r--r--core/java/android/app/ContextImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 2df35df2009d..2ef046d8e1fa 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2419,7 +2419,7 @@ class ContextImpl extends Context {
int res = -1;
try {
res = mount.mkdirs(getPackageName(), dir.getAbsolutePath());
- } catch (RemoteException e) {
+ } catch (Exception ignored) {
}
if (res != 0) {
Log.w(TAG, "Failed to ensure directory: " + dir);