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

Commit cc912089 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Don't clobber intent flags when starting recent activities anew. (Bug... 

Merge "Don't clobber intent flags when starting recent activities anew. (Bug 16327074)" into lmp-dev
parents ac17c2a8 dc9b7e7e

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+5 −3
Original line number Diff line number Diff line
@@ -456,9 +456,11 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV 
                } else {

                    // Launch the activity anew with the desired animation

                    Intent i = new Intent(task.key.baseIntent);

                    i.setFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY

                            | Intent.FLAG_ACTIVITY_TASK_ON_HOME

                            | Intent.FLAG_ACTIVITY_NEW_TASK);

                    i.addFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY

                            | Intent.FLAG_ACTIVITY_TASK_ON_HOME);

                    if ((i.getFlags() & Intent.FLAG_ACTIVITY_NEW_DOCUMENT) == 0) {

                        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                    }

                    try {

                        UserHandle taskUser = new UserHandle(task.userId);

                        if (launchOpts != null) {