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

Change-Id: I601bade61837e4408be083530d10c48c0595b38c
2015-04-01 12:32:32 -07:00
parent 2e6d12543c
commit 356c628e1b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -657,7 +657,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
                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;