summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-01-09 19:24:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-09 19:24:31 +0000
commitd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd (patch)
treeac60878baafd6fb6cb9d8377702a7502cba7d8bb /core/java/android/app
parent2abf1f1c212574ea7073584406ee86898f5d3779 (diff)
parent0cb736f754d8f487ebe4c8cc670e5dd2589eaea1 (diff)
downloadframeworks_base-d6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd.zip
frameworks_base-d6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd.tar.gz
frameworks_base-d6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd.tar.bz2
am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
automerge: 0cb736f * commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1': Guard against MountService throwing NPE.
Diffstat (limited to 'core/java/android/app')
-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 2df35df..2ef046d 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);