commit d7319df4d076b63a4ce07ac362cae7b30aef36cf
author nharold <nharold@google.com> Sat Jan 06 17:29:12 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 06 17:29:12 2018 +0000
tree 6529bc0809d8d03e3b8b4b5680ac1de650362d5d
parent 130d5e391512a8a9b8e193357621116372a2e6a7
parent 2b36299c73f7ba853b5b3acf4ea58facb9d4922e

Merge changes from topic "ipsec-resource-id-cleanup"
am: 2b36299c73

Change-Id: I5461b0e0746f8c60b425126d9badbae4630395bb

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();
     }
 }