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

Commit 13d534e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 28ed1887 cc64dfcf

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