Merge "Check EXTRA_INTENT as part of leaving process." (4b2f751e) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -9269,6 +9269,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) {