commit e35adbc4d23c06fc1d35490a2a16516817bce3f3
author Jeff Sharkey <jsharkey@android.com> Wed Jan 03 19:47:22 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 03 19:47:22 2018 +0000
tree 6888edc4bdf60b88a5ea2f0caf8d7701162a40e1
parent f8adea8255a3a05f5cc67ea953e3eb5a36d46a25
parent 6522970c1e743d4deb47b53fb66f76259343ea1e

Merge "Avoid NPE when missing underlyingCaps."
am: 6522970c1e

Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519

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 13617f1..533771a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarController.java
@@ -265,9 +265,7 @@
         mStatusBarIconController.getTransitionsController().dump(fd, pw, args);
         pw.println();
         pw.println(" NavigationBarTransitionsController:");
-        if (mNavigationBarController != null) {
-            mNavigationBarController.dump(fd, pw, args);
-        }
+        mNavigationBarController.dump(fd, pw, args);
         pw.println();
     }
 }