Merge "Fix device not locking properly on power press"

            mDeviceInteractive = false;

            mGoingToSleep = true;

            // Reset keyguard going away state so we can start listening for biometric auth

            setKeyguardGoingAway(false);

            // Reset keyguard going away state so we can start listening for fingerprint. We

            // explicitly DO NOT want to call mStatusBarWindowController.setKeyguardGoingAway(false)

            // here, since that will mess with the device lock state.

            mUpdateMonitor.setKeyguardGoingAway(false);

            // Lock immediately based on setting if secure (user has a pin/pattern/password).

            // This also "locks" the device when not secure to provide easy access to the

            mHideAnimationRun = false;

            adjustStatusBarLocked();

            userActivity();

            setKeyguardGoingAway(false);

            mUpdateMonitor.setKeyguardGoingAway(false);

            mStatusBarWindowController.setKeyguardGoingAway(false);

            mShowKeyguardWakeLock.release();

        }

        mKeyguardDisplayManager.show();

                        .KEYGUARD_GOING_AWAY_FLAG_SUBTLE_WINDOW_ANIMATIONS;

            }

            setKeyguardGoingAway(true);

            mUpdateMonitor.setKeyguardGoingAway(true);

            mStatusBarWindowController.setKeyguardGoingAway(true);

            // Don't actually hide the Keyguard at the moment, wait for window

            // manager until it tells us it's safe to do so with

        mHandler.removeMessages(KEYGUARD_DONE_PENDING_TIMEOUT);

    }

    private void setKeyguardGoingAway(boolean goingAway) {

        mUpdateMonitor.setKeyguardGoingAway(goingAway);

        mStatusBarWindowController.setKeyguardGoingAway(goingAway);

    }

    @Override

    public void onBootCompleted() {

        mUpdateMonitor.dispatchBootCompleted();

import static android.view.WindowManagerPolicyConstants.OFF_BECAUSE_OF_USER;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

        mViewMediator.start();

        mViewMediator.onStartedGoingToSleep(OFF_BECAUSE_OF_USER);

        verify(mUpdateMonitor).setKeyguardGoingAway(false);

        verify(mStatusBarWindowController).setKeyguardGoingAway(false);

        verify(mStatusBarWindowController, never()).setKeyguardGoingAway(anyBoolean());

    }

}