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

Commit 859465c1 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

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

Change-Id: I1f87d39822fe9a938b511a2b55fda2338311290e
parents 65436b09 13d534e7

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