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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-16 17:03:53 +00:00
committed by Android (Google) Code Review
parent f3c1c427b2 a596ca3030
commit d429e710de
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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