commit a9d1e2a92239aad4712d8141fbafb4a22e350544
author Ruchi Kandoi <kandoiruchi@google.com> Tue Jan 09 00:01:09 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 09 00:01:09 2018 +0000
tree 5db4def7f56fcc20c515b9c31337d686ff9cbd04
parent 28dd9dfeb541b24458e0cb66035ae978a4d281ef
parent 5d286326b15171d6a8a54d9fbc0e928fb06ef6bd

Merge "Don't wait for NFC when shutting down."
am: 5d286326b1

Change-Id: Ie1a26e5b7905fc7b1a6dbe0e1ee8f80c1030d1cc

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