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

Merge "Add mBouncer null checks for view-related requests." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-29 18:05:18 +00:00
committed by Android (Google) Code Review
parent 71f6afb212 16e0cbc048
commit 66bf0f533c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,9 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void notifyKeyguardAuthenticated(boolean strongAuth) {
mBouncer.notifyKeyguardAuthenticated(strongAuth);
if (mBouncer != null) {
mBouncer.notifyKeyguardAuthenticated(strongAuth);
}
}
@Override
@@ -204,11 +206,15 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void onFinishedGoingToSleep() {
mBouncer.onScreenTurnedOff();
if (mBouncer != null) {
mBouncer.onScreenTurnedOff();
}
}
@Override
public void onCancelClicked() {
if (!mShowing) return;
getOverlayViewGlobalStateController().setWindowFocusable(/* focusable= */ false);
getOverlayViewGlobalStateController().setWindowNeedsInput(/* needsInput= */ false);
@@ -228,6 +234,8 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public void startPreHideAnimation(Runnable finishRunnable) {
if (!mShowing) return;
mBouncer.startPreHideAnimation(finishRunnable);
}
@@ -260,12 +268,12 @@ public class CarKeyguardViewController extends OverlayViewController implements
@Override
public boolean isBouncerShowing() {
return mBouncer.isShowing();
return mBouncer != null && mBouncer.isShowing();
}
@Override
public boolean bouncerIsOrWillBeShowing() {
return mBouncer.isShowing() || mBouncer.inTransit();
return mBouncer != null && (mBouncer.isShowing() || mBouncer.inTransit());
}
@Override