Don't crash activity manager when supplying invalid URI

Change-Id: I30a058f14d5d0a09ba86fdd10312a51db7a4a9df Fixes: 29039290
2016-05-31 15:49:01 -07:00
parent cd0aa9cda8
commit cc64dfcf66
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -11272,6 +11272,9 @@ public final class ActivityManagerService extends ActivityManagerNative
        } 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) {