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

Commit 5c644074 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Initiate KeyguardDisplayState with default display state 

This change is to initiate the new KeyguardDisplayState with the default
display state for newly added display. Otherwise, the default value will
be used and the KeyguardController and other related classes will treat
the newly added display as unlocked even if the default display is
locked.

Bug: 436770343
Test: Add new display when locked, nothing other than the clock should
      be shown
Flag: EXEMPT BUGFIX
Change-Id: I005837226dbc4e1e20b9233bd0fd5ed18dfcd1af
parent 2a22330b

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

+8 −0
Original line number Diff line number Diff line
@@ -613,6 +613,14 @@ class KeyguardController { 
        KeyguardDisplayState state = mDisplayStates.get(displayId);

        if (state == null) {

            state = new KeyguardDisplayState(mService, displayId);

            if (displayId != DEFAULT_DISPLAY) {

                final KeyguardDisplayState defaultState = mDisplayStates.get(DEFAULT_DISPLAY);

                if (defaultState != null) {

                    state.mKeyguardShowing = defaultState.mKeyguardShowing;

                    state.mAodShowing = defaultState.mAodShowing;

                    state.mKeyguardGoingAway = defaultState.mKeyguardGoingAway;

                }

            }

            mDisplayStates.append(displayId, state);

        }

        return state;