From 2fec90513cab75eac8aac6ee2e20697f2520934d Mon Sep 17 00:00:00 2001
From: Andrii Kulian <akulian@google.com>
Date: Mon, 30 Jan 2017 18:57:44 -0800
Subject: [PATCH] Finish stopping activities if requested

If activity was in process of becoming invisible and it needed to be
finished, we weren't actually finishing it if we tried to do it while
in STOPPING state. This lead to activity being removed from stopping
list and stuck in FINISHING state.

Bug: 34195099
Test: android.server.cts.ActivityManagerActivityVisibilityTests
Test: #testFinishActivityWithMoveTaskToBackAfterPause
Test: #testFinishActivityWithMoveTaskToBackAfterStop
Change-Id: Ic892f998b7fda7d5ede9a84b1ab837dbef40af21
---
 services/core/java/com/android/server/am/ActivityStack.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 9ce7ae30ebe5b..47109f2090a24 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -3584,6 +3584,7 @@ final class ActivityStack extends ConfigurationContainer implements StackWindowL
                 || (prevState == ActivityState.PAUSED
                     && (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID))
                 || finishingActivityInNonFocusedStack
+                || prevState == ActivityState.STOPPING
                 || prevState == ActivityState.STOPPED
                 || prevState == ActivityState.INITIALIZING) {
             r.makeFinishingLocked();