From c11ce7b1cd1d1e5cda2c1e8acb5b165cd7ce50ef Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Mon, 27 Jun 2016 10:53:53 -0700 Subject: Resume only activities in focused stack While performing ensureActivitiesVisibleLocked we should only resume activity in focused stack. Otherwise we can get several resumed activities at the same time. Bug: 29619461 Change-Id: Id65fe1a29841ee3166694bfb6a8236151b9fc7ec --- services/core/java/com/android/server/am/ActivityStack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 4059a675c4fd..4ead64b6915b 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1706,7 +1706,8 @@ final class ActivityStack { final boolean stackInvisible = stackVisibility != STACK_VISIBLE; final boolean stackVisibleBehind = stackVisibility == STACK_VISIBLE_ACTIVITY_BEHIND; boolean behindFullscreenActivity = stackInvisible; - boolean resumeNextActivity = isFocusable() && (isInStackLocked(starting) == null); + boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this) + && (isInStackLocked(starting) == null); boolean behindTranslucentActivity = false; final ActivityRecord visibleBehind = getVisibleBehindActivity(); for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { -- cgit v1.2.3-59-g8ed1b