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

Fixes more null pointer exceptions caused by ag/9382746

Browse Source 
Test: tested locally
BUG:141940205
Change-Id: Icfccb560aa09555470da2303dead85e0ae4593ad
This commit is contained in:
Govinda Wasserman
2019-10-16 10:09:44 -04:00
parent c8ae06554b
commit a596ca3030
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());
}