diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-01 12:32:32 -0700 |
|---|---|---|
| committer | Wale Ogunwale <ogunwale@google.com> | 2015-04-01 12:32:32 -0700 |
| commit | 356c628e1b3ff6a3f327fdc512deb5288710ab47 (patch) | |
| tree | cdf2446dec198f92aa75503dccaeee0276e12938 /services | |
| parent | 2e6d12543cc1f904d682337261d16bdd7f8bea7a (diff) | |
| download | frameworks_base-356c628e1b3ff6a3f327fdc512deb5288710ab47.zip frameworks_base-356c628e1b3ff6a3f327fdc512deb5288710ab47.tar.gz frameworks_base-356c628e1b3ff6a3f327fdc512deb5288710ab47.tar.bz2 | |
fixed build breakage due to bad merge. again...
Change-Id: I601bade61837e4408be083530d10c48c0595b38c
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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; |