summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/TaskFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index a3f15038865c..0dd43c48e8b5 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -1906,6 +1906,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
prev.setWillCloseOrEnterPip(false);
final boolean wasStopping = prev.isState(STOPPING);
prev.setState(PAUSED, "completePausedLocked");
+ mPausingActivity = null;
if (prev.finishing) {
// We will update the activity visibility later, no need to do in
// completeFinishing(). Updating visibility here might also making the next
@@ -1941,7 +1942,6 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (prev != null) {
prev.stopFreezingScreen(true /* unfreezeNow */, true /* force */);
}
- mPausingActivity = null;
}
if (resumeNext) {