commit 356c628e1b3ff6a3f327fdc512deb5288710ab47
author Wale Ogunwale <ogunwale@google.com> Wed Apr 01 12:32:32 2015 -0700
committer Wale Ogunwale <ogunwale@google.com> Wed Apr 01 12:32:32 2015 -0700
tree cdf2446dec198f92aa75503dccaeee0276e12938
parent 2e6d12543cc1f904d682337261d16bdd7f8bea7a

fixed build breakage due to bad merge. again...

Change-Id: I601bade61837e4408be083530d10c48c0595b38c

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 07e3492..16c88d3 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -657,7 +657,7 @@
                 final ActivityStack stack = stacks.get(stackNdx);
                 final ActivityRecord r = stack.mResumedActivity;
                 if (r != null) {
-                    if (!r.nowVisible || r.waitingVisible) {
+                    if (!r.nowVisible || mWaitingVisibleActivities.contains(r)) {
                         return false;
                     }
                     foundResumed = true;