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

automerge: 0cb736f

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.

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