Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Partial revert of keyguard checks" into rvc-dev am: 2a3c62046c am: 8007d1ee8c am: 7ba19b69ca

Browse Source 
Change-Id: I92e035766a3974a6db0a746c35d7da76b2873815
This commit is contained in:
Yuncheol Heo
2020-05-08 02:03:05 +00:00
committed by Automerger Merge Worker
parent be4cdfef1e 7ba19b69ca
commit b6607bd0fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CarSystemUI/src/com/android/systemui/car/keyguard/CarKeyguardViewController.java
View File

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