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

Commit 6e4f6ecb authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev

parents 0346fee9 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;
    }