Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev

am: 13d534e7f2

* commit '13d534e7f2419219e3e26e582b1f6f5ae79be408':
  Don't crash activity manager when supplying invalid URI

Change-Id: Iddb17cdf953668ad8bfae6a54a5eb9141ec12ad2

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