commit 905d51a2f83768663f9c026080a003cf8ef78a82
author Julia Reynolds <juliacr@google.com> Fri Jul 31 14:22:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 14:22:50 2015 +0000
tree 2e3731a3938dafd110dcb3d5d4f59caf38dad5dc
parent fe04d76ed9a8f2aa486c2e0b185cfce5955f9af5
parent 2a23ef2817bc424c7b1f353394c4653463bd7522

am 2a23ef28: am 8ceb1188: am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev

* commit '2a23ef2817bc424c7b1f353394c4653463bd7522':
  Fix SysUI crash on device boot.

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index af25562..367ff1a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -380,16 +380,18 @@
         mLayoutTransitionsEnabled = enabled;
         ViewGroup navButtons = (ViewGroup) mCurrentView.findViewById(R.id.nav_buttons);
         LayoutTransition lt = navButtons.getLayoutTransition();
-        if (enabled) {
-            lt.enableTransitionType(LayoutTransition.APPEARING);
-            lt.enableTransitionType(LayoutTransition.DISAPPEARING);
-            lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING);
-            lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
-        } else {
-            lt.disableTransitionType(LayoutTransition.APPEARING);
-            lt.disableTransitionType(LayoutTransition.DISAPPEARING);
-            lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING);
-            lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
+        if (lt != null) {
+            if (enabled) {
+                lt.enableTransitionType(LayoutTransition.APPEARING);
+                lt.enableTransitionType(LayoutTransition.DISAPPEARING);
+                lt.enableTransitionType(LayoutTransition.CHANGE_APPEARING);
+                lt.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
+            } else {
+                lt.disableTransitionType(LayoutTransition.APPEARING);
+                lt.disableTransitionType(LayoutTransition.DISAPPEARING);
+                lt.disableTransitionType(LayoutTransition.CHANGE_APPEARING);
+                lt.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);
+            }
         }
     }