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

Commit d975003a authored by lei.peng's avatar lei.peng Committed by android-build-merger
Browse files

Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3 

am: 93c75d07

Change-Id: I5436618eb3ddd752a95caa5b0c427a3e32279a49
parents 7cbe1335 93c75d07

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;

        }