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

Commit f11c2f7d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by The Android Automerger
Browse files

Don't crash activity manager when supplying invalid URI 

Change-Id: I30a058f14d5d0a09ba86fdd10312a51db7a4a9df
Fixes: 29039290
parent 066527c4

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