commit d8514e82aa4a07d118d9e66e2e0e73bae56f4ac8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 21 15:27:44 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 21 15:27:44 2017 +0000
tree a09bf1fdf79d647dfd9534da095505537a19b4ac
parent 47d04fc5c0f49211f95cdf23c362b92efc298ecd
parent 2aa5a9df8a3ddea69146e126ccc21da77b2a228d

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

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java
index 533771a..13617f1 100644
--- 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 @@
         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();
     }
 }