Merge "Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 am: 859465c105" into nyc-mr1-dev-plus-aosp

2016-06-01 23:05:04 +00:00
parent 8ee81d525e b4e81ff4c3
commit 1c943786eb
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) {