Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b976ba62 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Add Displaycontent Detection" into udc-dev am: 497d09ac 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22748562



Change-Id: I7374ff90f74cf05685f79af2b700d87a9c7da900
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af5885f9 497d09ac

services/core/java/com/android/server/wm/Task.java

+1 −1
Original line number Diff line number Diff line
@@ -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();