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

Commit b2b5773a authored by Yifei Zhang's avatar Yifei Zhang
Browse files

keyguard: fix logic for skip reporting keyguard state 

- Fix bug introduced by ag/32707196
- Rename variables according to ag/32707196

Flag: com.android.window.flags.dispatch_first_keyguard_locked_state
Test: manual
Bug: 375029840
Change-Id: I0afd9b07aeb9bf796f51be2c91c3cb5519a784e2
parent 4a4c22dc

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

+7 −7
Original line number Diff line number Diff line
@@ -475,10 +475,10 @@ public class WindowManagerService extends IWindowManager.Stub 
    private final List<OnWindowRemovedListener> mOnWindowRemovedListeners = new ArrayList<>();



    /** Indicates whether the first keyguard locked state has been dispatched. */

    private boolean mHasDispatchedKeyguardLockedState = false;

    private boolean mFirstKeyguardLockedStateDispatched = false;



    /** The last dispatched keyguard locked state. */

    private boolean mLastDispatchedKeyguardLockedState = false;

    private boolean mDispatchedKeyguardLockedState = false;



    // VR Vr2d Display Id.

    int mVr2dDisplayId = INVALID_DISPLAY;
@@ -3607,12 +3607,12 @@ public class WindowManagerService extends IWindowManager.Stub 
            final boolean isKeyguardLocked = mPolicy.isKeyguardShowing();

            if (mFlags.mDispatchFirstKeyguardLockedState) {

                // Ensure we don't skip the call for the first dispatch

                if (!mHasDispatchedKeyguardLockedState

                        && mLastDispatchedKeyguardLockedState == isKeyguardLocked) {

                if (mFirstKeyguardLockedStateDispatched

                        && mDispatchedKeyguardLockedState == isKeyguardLocked) {

                    return;

                }

            } else {

                if (mLastDispatchedKeyguardLockedState == isKeyguardLocked) {

                if (mDispatchedKeyguardLockedState == isKeyguardLocked) {

                    return;

                }

            }
@@ -3626,8 +3626,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

            }

            mKeyguardLockedStateListeners.finishBroadcast();

            mLastDispatchedKeyguardLockedState = isKeyguardLocked;

            mHasDispatchedKeyguardLockedState = true;

            mDispatchedKeyguardLockedState = isKeyguardLocked;

            mFirstKeyguardLockedStateDispatched = true;

        });

    }