summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Weir <justinweir@google.com> 2023-12-11 12:14:03 -0500
committer Justin Weir <justinweir@google.com> 2023-12-11 12:41:02 -0500
commita47d0bb30a37acf98ba24a7f0b30e109d74ad431 (patch)
tree5db233c27646716a7b573c47b3493e951f67b232
parent59d4fd4a2c0e3fc6635fa9f756da9f6bf7b45027 (diff)
Null check some nullables
Fixes: 315779193 Test: Presubmits Flag: N/A Change-Id: I2ede8b005c8687e9539d57007bdde15964de2a1f
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java17
1 files changed, 13 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index daadedb06187..4999123247a9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -36,6 +36,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewRootImpl;
+import android.view.WindowInsetsController;
import android.window.BackEvent;
import android.window.OnBackAnimationCallback;
import android.window.OnBackInvokedDispatcher;
@@ -859,10 +860,19 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
}
}
+ private void setRootViewAnimationDisabled(boolean disabled) {
+ ViewGroup windowRootView = mNotificationShadeWindowController.getWindowRootView();
+ if (windowRootView != null) {
+ WindowInsetsController insetsController = windowRootView.getWindowInsetsController();
+ if (insetsController != null) {
+ insetsController.setAnimationsDisabled(disabled);
+ }
+ }
+ }
+
@Override
public void onStartedWakingUp() {
- mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController()
- .setAnimationsDisabled(false);
+ setRootViewAnimationDisabled(false);
NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();
if (navBarView != null) {
navBarView.forEachView(view ->
@@ -875,8 +885,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
@Override
public void onStartedGoingToSleep() {
- mNotificationShadeWindowController.getWindowRootView().getWindowInsetsController()
- .setAnimationsDisabled(true);
+ setRootViewAnimationDisabled(true);
NavigationBarView navBarView = mCentralSurfaces.getNavigationBarView();
if (navBarView != null) {
navBarView.forEachView(view ->