Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d429e710 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes more null pointer exceptions caused by ag/9382746"

parents f3c1c427 a596ca30

packages/SystemUI/src/com/android/systemui/assist/ui/DefaultUiController.java

+5 −2
Original line number Diff line number Diff line
@@ -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);

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+5 −2
Original line number Diff line number Diff line
@@ -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());

        }