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

Commit 870489e9 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

am: 39be2e91

Change-Id: I43b583256b5975ca1206c9474bd64ee56e2419b0
parents 87a867e8 39be2e91
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -4464,7 +4464,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;
    }