summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-09-28 14:26:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 14:26:25 +0000
commit0f75c2b347c6fc7963d925b91d2bc45592fa01b3 (patch)
tree4a61006962bd67abcf49ddc17a1190d1562f192a
parent72cbd9351c23569ae382d06152e9428589558830 (diff)
parent185c1bced8b793ca50c42bbee0dc9063f47ec686 (diff)
Merge "Toast: Fix ActivityRecord does not attached to process" am: 185c1bced8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2233847 Change-Id: I395dbb56a55906546d3ba95309129d5342e7f9d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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 1b0c01816f73..9050d79d714f 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -1695,7 +1695,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
ProtoLog.v(WM_DEBUG_STATES, "Executing finish of activity: %s", prev);
prev = prev.completeFinishing(false /* updateVisibility */,
"completePausedLocked");
- } else if (prev.hasProcess()) {
+ } else if (prev.attachedToProcess()) {
ProtoLog.v(WM_DEBUG_STATES, "Enqueue pending stop if needed: %s "
+ "wasStopping=%b visibleRequested=%b", prev, wasStopping,
prev.mVisibleRequested);