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

Commit 6fa85799 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Simplify condition to check resumed activity when unlocking" into main

parents 5d914b59 b34b4198

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

+3 −6
Original line number Diff line number Diff line
@@ -3757,16 +3757,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);

                }