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

Browse Source
This commit is contained in:
Yuncheol Heo
2020-05-08 01:21:15 +00:00
committed by Android (Google) Code Review
parent d59d694f11 7c165162b8
commit 2a3c62046c
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);
} }