commit 9a04435e5fb7c5869d81184736c97097e24fd881
author Craig Mautner <cmautner@google.com> Wed Aug 07 18:26:48 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 07 18:26:49 2013 +0000
tree d8bdf718d74bcc76af234806afe681e173897284
parent d8e974931ede2344e49416f1586279dab8107cab
parent d0f964f93f100a8a8a2c22df98964a82219dc77f

Merge "Compare tasks not activities."

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

diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index 467c0b3..dc2b0ae 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1418,7 +1418,8 @@
                             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;