Fix NPE in NavigationBarView during bugreport

Commit "Merge Navigation Bar and Pie Controls button config (1/2)"
changed the tag field on the navigation bar buttons. This was not
reflected in NavigationBarView#dump() method, which lead to a NPE.

Also take into account that back and recents buttons may not be
present in the navigation bar.

Change-Id: Ie590608a4ad27753b673320132af7ec42d7a2ade

1 files changed, 12 insertions, 16 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 047ee58..968cd38 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -572,22 +572,18 @@ public class NavigationBarView extends LinearLayout implements BaseStatusBar.Nav
                         mLowProfile ? "true" : "false",
                         mShowMenu ? "true" : "false"));
 
-        final View back = mCurrentView.findViewWithTag("back");
-        final View home = mCurrentView.findViewWithTag("home");
-        final View recent = mCurrentView.findViewWithTag("recent");
-
-        pw.println("      back: "
-                + PhoneStatusBar.viewInfo(back)
-                + " " + visibilityToString(back.getVisibility())
-                );
-        pw.println("      home: "
-                + PhoneStatusBar.viewInfo(home)
-                + " " + visibilityToString(home.getVisibility())
-                );
-        pw.println("      rcnt: "
-                + PhoneStatusBar.viewInfo(recent)
-                + " " + visibilityToString(recent.getVisibility())
-                );
+        final View back = mCurrentView.findViewWithTag(NavigationButtons.BACK);
+        final View home = mCurrentView.findViewWithTag(NavigationButtons.HOME);
+        final View recent = mCurrentView.findViewWithTag(NavigationButtons.RECENT);
+
+        pw.println("      back: " + back != null ?
+                PhoneStatusBar.viewInfo(back) + " " + visibilityToString(back.getVisibility())
+                : "null" );
+        pw.println("      home: " +
+                PhoneStatusBar.viewInfo(home) + " " + visibilityToString(home.getVisibility()));
+        pw.println("      rcnt: " + recent != null ?
+                PhoneStatusBar.viewInfo(recent) + " " + visibilityToString(recent.getVisibility())
+                : "null" );
         pw.println("    }");
     }