summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ot904265 <ot_haven.li@mediatek.com> 2023-03-15 12:14:57 +0800
committer Evan Rosky <erosky@google.com> 2023-04-19 11:32:07 -0700
commit492dac69a31a67878b8c7bbd97a0227f82b7fc2b (patch)
tree2a96fe22da8ce18dbef53e8876c18b05e03aa9c5
parent0ecccdd14ca84b9ff81333d02c12e0a87a4e4e94 (diff)
Add Displaycontent Detection
The root cause is moveTaskToBackInner may start at a later time, should ensure that the task is still attached before calling moveTaskToBackInner. Bug: 273689553 Test: run monkey test Change-Id: I606eb22df1f6b36b478a1f3db51d73657a766a0d
-rw-r--r--services/core/java/com/android/server/wm/Task.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 5c33e6470024..99d3cc0737d1 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5652,7 +5652,7 @@ class Task extends TaskFragment {
(deferred) -> {
// Need to check again if deferred since the system might
// be in a different state.
- if (deferred && !canMoveTaskToBack(tr)) {
+ if (!isAttached() || (deferred && !canMoveTaskToBack(tr))) {
Slog.e(TAG, "Failed to move task to back after saying we could: "
+ tr.mTaskId);
transition.abort();