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

Commit 80587da3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Modify the case in adjustFocus when the mFocusedActivity is null"

parents 66f15cc0 75685f74

services/core/java/com/android/server/am/ActivityStack.java

+2 −1
Original line number Diff line number Diff line
@@ -3157,7 +3157,8 @@ final class ActivityStack { 
    }



    private void adjustFocusedActivityLocked(ActivityRecord r, String reason) {

        if (!mStackSupervisor.isFocusedStack(this) || mService.mFocusedActivity != r) {

        if (!mStackSupervisor.isFocusedStack(this) || (mService.mFocusedActivity != r

                && mService.mFocusedActivity != null)) {

            return;

        }