From 356c628e1b3ff6a3f327fdc512deb5288710ab47 Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Wed, 1 Apr 2015 12:32:32 -0700
Subject: [PATCH] fixed build breakage due to bad merge. again...

Change-Id: I601bade61837e4408be083530d10c48c0595b38c
---
 .../java/com/android/server/am/ActivityStackSupervisor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 07e3492b97803..16c88d35cfe89 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 @@ 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;