From 7b6f3b60a9cfc19af565ce2e2fc690ca65bc1e51 Mon Sep 17 00:00:00 2001
From: Alison Cichowlas <asc@google.com>
Date: Fri, 7 Dec 2018 09:06:57 -0500
Subject: [PATCH] Additional activity in new Chooser flow must also forward
 Results.

Re-enable new Chooser flow.

Bug: 120417119
Test: Attach files in Gmail; ApiDemos.apk Content > Storage > Docs > GET_CONTENT
Change-Id: I4dc093e24c7415e10bfae0598038c3eb87029d5b
---
 core/java/com/android/internal/app/ResolverActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 46c6fa42babf1..ef5eb6cb57804 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -94,7 +94,7 @@ import java.util.Set;
 public class ResolverActivity extends Activity {
 
     // Temporary flag for new chooser delegate behavior.
-    boolean mEnableChooserDelegate = false;
+    boolean mEnableChooserDelegate = true;
 
     protected ResolveListAdapter mAdapter;
     private boolean mSafeForwardingMode;
@@ -887,6 +887,8 @@ public class ResolverActivity extends Activity {
             chooserIntent.putExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY,
                     ignoreTargetSecurity);
             chooserIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+            chooserIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT
+                    | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
             startActivity(chooserIntent);
         } catch (RemoteException e) {
             Log.e(TAG, e.toString());