Merge "Fix NPE in NavigationBarView during bugreport" into cm-10.1 (e1d2511d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+12 −16

Original line number	Diff line number	Diff line
		@@ -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(" }");
		}