Skip to content

Commit 5d6a2d3

Browse files
Julia ReynoldsAndroid (Google) Code Review
authored andcommitted
Merge "Fix SysUI crash on device boot." into mnc-dev
2 parents 9a81a18 + 8478aba commit 5d6a2d3

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -370,16 +370,18 @@ private void setLayoutTransitionsEnabled(boolean enabled) {
370370
mLayoutTransitionsEnabled = enabled;
371371
ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons);
372372
LayoutTransition lt = navButtons.getLayoutTransition();
373-
if (enabled) {
374-
lt.enableTransitionType(LayoutTransition.APPEARING);
375-
lt.enableTransitionType(LayoutTransition.DISAPPEARING);
376-
lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING);
377-
lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
378-
} else {
379-
lt.disableTransitionType(LayoutTransition.APPEARING);
380-
lt.disableTransitionType(LayoutTransition.DISAPPEARING);
381-
lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING);
382-
lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
373+
if (lt != null) {
374+
if (enabled) {
375+
lt.enableTransitionType(LayoutTransition.APPEARING);
376+
lt.enableTransitionType(LayoutTransition.DISAPPEARING);
377+
lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING);
378+
lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
379+
} else {
380+
lt.disableTransitionType(LayoutTransition.APPEARING);
381+
lt.disableTransitionType(LayoutTransition.DISAPPEARING);
382+
lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING);
383+
lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
384+
}
383385
}
384386
}
385387

0 commit comments

Comments
 (0)