Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4e81ff4 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

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

am: 859465c1

* commit '859465c1':
  Don't crash activity manager when supplying invalid URI

Change-Id: I0e7a036384d4e30a6bfedcefb3eb18774a55538d
parents 8424925f 859465c1

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

+3 −0
Original line number Diff line number Diff line
@@ -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) {