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

Commit 4e9ae882 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deflag dispatch_first_keyguard_locked_state" into main

parents 361ecf28 d81d9c5b

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -364,17 +364,6 @@ flag { 
    bug: "382774299"

}



flag {

    namespace: "wear_frameworks"

    name: "dispatch_first_keyguard_locked_state"

    description: "Ensures the first keyguard locked state is dispatched to listeners reigstered through KeyguardManager.addKeyguardLockedStateListener"

    bug: "375029840"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "remove_starting_in_transition"

    namespace: "windowing_frontend"

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

+0 −2
Original line number Diff line number Diff line
@@ -52,7 +52,5 @@ class WindowManagerFlags { 


    final boolean mAodTransition = Flags.aodTransition();



    final boolean mDispatchFirstKeyguardLockedState = Flags.dispatchFirstKeyguardLockedState();



    /* End Available Flags */

}

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

+4 −10
Original line number Diff line number Diff line
@@ -3623,17 +3623,11 @@ public class WindowManagerService extends IWindowManager.Stub 
    private void dispatchKeyguardLockedState() {

        mH.post(() -> {

            final boolean isKeyguardLocked = mPolicy.isKeyguardShowing();

            if (mFlags.mDispatchFirstKeyguardLockedState) {

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

            if (mFirstKeyguardLockedStateDispatched

                    && mDispatchedKeyguardLockedState == isKeyguardLocked) {

                return;

            }

            } else {

                if (mDispatchedKeyguardLockedState == isKeyguardLocked) {

                    return;

                }

            }

            final int n = mKeyguardLockedStateListeners.beginBroadcast();

            for (int i = 0; i < n; i++) {

                try {