From a596ca30303c6f11e9ed81ad8e9791add45af183 Mon Sep 17 00:00:00 2001 From: Govinda Wasserman Date: Wed, 16 Oct 2019 10:09:44 -0400 Subject: Fixes more null pointer exceptions caused by ag/9382746 Test: tested locally BUG:141940205 Change-Id: Icfccb560aa09555470da2303dead85e0ae4593ad --- .../src/com/android/systemui/assist/ui/DefaultUiController.java | 7 +++++-- .../com/android/systemui/statusbar/phone/NavigationBarView.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java index 9958124a14e4..4cb1708468ea 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java +++ b/packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java @@ -164,8 +164,11 @@ public class DefaultUiController implements AssistManager.UiController { } private void updateAssistHandleVisibility() { - AssistHandleViewController controller = Dependency.get(NavigationBarController.class) - .getAssistHandlerViewController(); + NavigationBarController navigationBarController = + Dependency.get(NavigationBarController.class); + AssistHandleViewController controller = + navigationBarController == null + ? null : navigationBarController.getAssistHandlerViewController(); if (controller != null) { controller.setAssistHintBlocked(mInvocationInProgress); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 9804f9ff4698..ae18833d99b5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -1212,8 +1212,11 @@ public class NavigationBarView extends FrameLayout implements setClipChildren(shouldClip); setClipToPadding(shouldClip); - AssistHandleViewController controller = Dependency.get(NavigationBarController.class) - .getAssistHandlerViewController(); + NavigationBarController navigationBarController = + Dependency.get(NavigationBarController.class); + AssistHandleViewController controller = + navigationBarController == null + ? null : navigationBarController.getAssistHandlerViewController(); if (controller != null) { controller.setBottomOffset(insets.getSystemWindowInsetBottom()); } -- cgit v1.2.3-59-g8ed1b