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

Commit 39be2e91 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

DO NOT MERGE -- Use focused activity value when moving task back

am: da3b648b

Change-Id: Ib706755c056ed27050375a675169f7df3f5f141a
parents a2ffd6e0 da3b648b
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -4463,7 +4463,9 @@ final class ActivityStack {
                    "moveTaskToBackAndShowHome");
        }

        adjustFocusedActivityLocked(mResumedActivity, "moveTaskToBack");
        // Using currently focused activity value from service instead of mResumedActivity,
        // because if this happens when device is locked the mResumedActivity will be null.
        adjustFocusedActivityLocked(mService.mFocusedActivity, "moveTaskToBack");
        mStackSupervisor.resumeFocusedStackTopActivityLocked();
        return true;
    }