Merge "Partial revert of keyguard checks" into rvc-dev am: 2a3c62046c

Change-Id: Ief8c04d6a677964bbe1584481a80775a9323382e
This commit is contained in:
Yuncheol Heo
2020-05-11 12:45:22 +00:00
committed by Automerger Merge Worker

View File

@@ -213,7 +213,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void onCancelClicked() {
if (!mShowing) return;
if (mBouncer == null) return;
getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);
getOverlayViewGlobalStateController().setWindowNeedsInput(/* needsInput= */ false);
@@ -234,7 +234,7 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void startPreHideAnimation(Runnable finishRunnable) {
if (!mShowing) return;
if (mBouncer == null) return;
mBouncer.startPreHideAnimation(finishRunnable);
}