Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NavigationBarController NPE"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-02 14:52:49 +00:00
committed by Android (Google) Code Review
parent 1218fc96f6 131c76d485
commit 8bbb29fac5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java
View File

@@ -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();
}
}

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

@@ -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();
}
}