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

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

Merge "Fix NavigationBarController NPE"

parents 1218fc96 131c76d4

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

+2 −1
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ public class NavigationBarController implements Callbacks { 


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

    public AssistHandleViewController getAssistHandlerViewController() {

        return getDefaultNavigationBarFragment().getAssistHandlerViewController();

        NavigationBarFragment navBar = getDefaultNavigationBarFragment();

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

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/NavigationBarControllerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.doNothing; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -240,4 +241,10 @@ public class NavigationBarControllerTest extends SysuiTestCase { 


        verify(mSecondaryNavBar).disableAnimationsDuringHide(eq(500L));

    }



    @Test

    public void testGetAssistHandlerViewController_noCrash() {

        reset(mNavigationBarController.mNavigationBars);

        mNavigationBarController.getAssistHandlerViewController();

    }

}