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

Commit 167f01a1 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:... 

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

Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206
parents 85f037ac d975003a

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

+2 −1
Original line number Diff line number Diff line
@@ -3197,7 +3197,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;

        }