Merge "Fix random systemui crashes during cts test DO NOT MERGE"

2017-12-21 15:27:44 +00:00
parent 47d04fc5c0 2aa5a9df8a
commit d8514e82aa
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java
@@ -265,7 +265,9 @@ public class LightBarController implements BatteryController.BatteryStateChangeC
        mStatusBarIconController.getTransitionsController().dump(fd, pw, args);
        pw.println();
        pw.println(" NavigationBarTransitionsController:");
-        mNavigationBarController.dump(fd, pw, args);
+        if (mNavigationBarController != null) {
+            mNavigationBarController.dump(fd, pw, args);
+        }
        pw.println();
    }
 }