commit f11c2f7d59144041adad7dcd8da76f1d57ab4a7a
author Jorim Jaggi <jjaggi@google.com> Tue May 31 15:49:01 2016 -0700
committer The Android Automerger <android-build@google.com> Wed Jun 01 16:59:57 2016 -0700
tree 720b41dfac969b17d09068e998a0dac1c0666aec
parent 066527c4c935522eb683229bd811a23a22ee74f1

Don't crash activity manager when supplying invalid URI

Change-Id: I30a058f14d5d0a09ba86fdd10312a51db7a4a9df
Fixes: 29039290

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index e07243f..de21c4e 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -11272,6 +11272,9 @@
         } catch (RemoteException e) {
             Log.w(TAG, "Content provider dead retrieving " + uri, e);
             return null;
+        } catch (Exception e) {
+            Log.w(TAG, "Exception while determining type of " + uri, e);
+            return null;
         } finally {
             // We need to clear the identity to call removeContentProviderExternalUnchecked
             if (!clearedIdentity) {