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

Commit b34b4198 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Simplify condition to check resumed activity when unlocking 

The latest resumed activity will update to mTopApp. So it is enough
to check from the global top rather than looping each display. Then
it will be simpler to avoid calling keyguardGoingAway for each display
in the future.

Bug: 423613749
Flag: EXEMPT bugfix
Test: atest KeyguardLockedTests
Change-Id: I634ebd29e513502a0ded80f6e3391a3bd59ab423
parent a08a0293

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+3 −6
Original line number Diff line number Diff line
@@ -3740,16 +3740,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    mDemoteTopAppReasons |= DEMOTE_TOP_REASON_DURING_UNLOCKING;

                }



                boolean foundResumed = false;

                final boolean wasNoResumed = mTopApp == null || !mTopApp.hasResumedActivity();

                for (int i = mRootWindowContainer.getChildCount() - 1; i >= 0; i--) {

                    final DisplayContent dc = mRootWindowContainer.getChildAt(i);

                    final boolean wasNoResumed = dc.mFocusedApp == null

                            || !dc.mFocusedApp.isState(RESUMED);

                    mKeyguardController.keyguardGoingAway(dc.mDisplayId, flags);

                    if (wasNoResumed && dc.mFocusedApp != null && dc.mFocusedApp.isState(RESUMED)) {

                        foundResumed = true;

                    }

                }

                final boolean foundResumed = wasNoResumed

                        && mTopApp != null && mTopApp.hasResumedActivity();

                if (isPowerModePreApplied && !foundResumed) {

                    endPowerMode(POWER_MODE_REASON_START_ACTIVITY);

                }