commit 0cb736f754d8f487ebe4c8cc670e5dd2589eaea1
author Jeff Sharkey <jsharkey@android.com> Fri Jan 09 19:21:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 09 19:21:24 2015 +0000
tree 6e6a19679b95dab9e9cbef300d13e933c68b7db0
parent a319aa800df36d40e1de453b64fd1e14573e6d80
parent 2b46774ff950270365238e12e4a336e2004500e2

am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev

* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.

core/java/android/app/ContextImpl.java

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 @@
                         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);