Merge "Check EXTRA_INTENT as part of leaving process."

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index d92dff6d3c59..870db217003c 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -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) {