From c6fe23df527afbe5841a251796e720ee0cd777c4 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 24 Feb 2017 09:39:58 -0700
Subject: 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
---
 core/java/android/content/Intent.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index b0505ac4a3a2..7de0a5100bda 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -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) {
-- 
cgit v1.2.3-59-g8ed1b