commit c9e7c10afbe77215011fe7f68e332207824d673f
author Hans Boehm <hboehm@google.com> Tue Jan 09 04:46:32 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 09 04:46:32 2018 +0000
tree 5920d30c63cb00c955ed665ec3f52b46c886c75f
parent a9d1e2a92239aad4712d8141fbafb4a22e350544
parent 90027eb1c22a15ae64f5f1102fddc56c8c2cfe0f

Merge "Only count uncleared ProxyMap refs when deciding to crash"
am: 90027eb1c2

Change-Id: I56471aa9ac0b93e3280b48fed3b29ad2b743cf39

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