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

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

Merge "Fixes NullPointerException introduced in ag/9382746"

parents 9011d90f 5723657e

packages/SystemUI/src/com/android/systemui/assist/AssistModule.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Handler; 
import android.os.HandlerThread;

import android.os.SystemClock;



import androidx.annotation.Nullable;

import androidx.slice.Clock;



import com.android.internal.app.AssistUtils;
@@ -68,6 +69,7 @@ public abstract class AssistModule { 
    }



    @Provides

    @Nullable

    static AssistHandleViewController provideAssistHandleViewController(

            NavigationBarController navigationBarController) {

        return navigationBarController.getAssistHandlerViewController();

packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java

+2 −0
Original line number Diff line number Diff line
@@ -233,11 +233,13 @@ public class NavigationBarController implements Callbacks { 
    }



    /** @return {@link NavigationBarFragment} on the default display. */

    @Nullable

    public NavigationBarFragment getDefaultNavigationBarFragment() {

        return mNavigationBars.get(DEFAULT_DISPLAY);

    }



    /** @return {@link AssistHandleViewController} (only on the default display). */

    @Nullable

    public AssistHandleViewController getAssistHandlerViewController() {

        NavigationBarFragment navBar = getDefaultNavigationBarFragment();

        return navBar == null ? null : navBar.getAssistHandlerViewController();