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

Commit c6fe23df authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Check EXTRA_INTENT as part of leaving process. 

We're checking all the other Intent objects, but we forgot this one.

Test: builds, boots
Bug: 34072700
Change-Id: I4f328950f3122258e0bdea7e87f78d7d0afdedbb
parent 830d4b42

core/java/android/content/Intent.java

+7 −0
Original line number Diff line number Diff line
@@ -9238,6 +9238,13 @@ public class Intent implements Parcelable, Cloneable { 
            mClipData.prepareToLeaveProcess(leavingPackage, getFlags());

        }



        if (mExtras != null && !mExtras.isParcelled()) {

            final Object intent = mExtras.get(Intent.EXTRA_INTENT);

            if (intent instanceof Intent) {

                ((Intent) intent).prepareToLeaveProcess(leavingPackage);

            }

        }



        if (mAction != null && mData != null && StrictMode.vmFileUriExposureEnabled()

                && leavingPackage) {

            switch (mAction) {