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

Commit 7b6f3b60 authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

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
parent f3867a70

core/java/com/android/internal/app/ResolverActivity.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ import java.util.Set; 
public class ResolverActivity extends Activity {

public class ResolverActivity extends Activity {





    // Temporary flag for new chooser delegate behavior.

    // Temporary flag for new chooser delegate behavior.

    boolean mEnableChooserDelegate = false;

    boolean mEnableChooserDelegate = true;





    protected ResolveListAdapter mAdapter;

    protected ResolveListAdapter mAdapter;

    private boolean mSafeForwardingMode;

    private boolean mSafeForwardingMode;
@@ -887,6 +887,8 @@ public class ResolverActivity extends Activity { 
            chooserIntent.putExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY,

            chooserIntent.putExtra(ActivityTaskManager.EXTRA_IGNORE_TARGET_SECURITY,

                    ignoreTargetSecurity);

                    ignoreTargetSecurity);

            chooserIntent.putExtra(Intent.EXTRA_USER_ID, userId);

            chooserIntent.putExtra(Intent.EXTRA_USER_ID, userId);

            chooserIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT

                    | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);

            startActivity(chooserIntent);

            startActivity(chooserIntent);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Log.e(TAG, e.toString());

            Log.e(TAG, e.toString());