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

Commit 9a04435e authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Compare tasks not activities."

parents d8e97493 d0f964f9

services/java/com/android/server/am/ActivityStackSupervisor.java

+2 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,8 @@ public final class ActivityStackSupervisor { 
                            null : lastStack.topRunningNonDelayedActivityLocked(notTop);

                    if (curTop != null && curTop.task != intentActivity.task) {

                        r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);

                        if (sourceRecord == null || sourceStack.topActivity() == sourceRecord) {

                        if (sourceRecord == null || (sourceStack.topActivity() != null &&

                                sourceStack.topActivity().task == sourceRecord.task)) {

                            // We really do want to push this one into the

                            // user's face, right now.

                            movedHome = true;