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

Commit 75685f74 authored by lei.peng's avatar lei.peng Committed by Yuntao.Xiao
Browse files

Modify the case in adjustFocus when the mFocusedActivity is null 

Starting activity failed and the mFocusedActvity become null,
consider this condition when adjust focus.

Because in this condition, the focus mismatch between
ActivityManagerService#mFocusedActivity and
InputDispatcher(inputfilnger)#mFocusedApplication, ANR may occur.

Test: monkey test 48h with no ANR

Change-Id: Id1a2bf0d6ca6530e34443d359fbe2aa6c11b878c
parent 66f15cc0

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;

        }