From 1e68fb3c3842bb90ed3f474cef0ddf7116eace0e Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 2 May 2014 16:06:20 -0400 Subject: [PATCH] Add null check on navigation bar visibility When there are hardware keys getNavigationBarView() returns null, this just checks before setting the visibility. Bug: 14491311 Change-Id: I2ea8b62b1dfe05ca09636870b37dff184730369e --- .../statusbar/phone/StatusBarKeyguardViewManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index c2595cfd2cb7f..db244fecab3be 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -213,10 +213,12 @@ public class StatusBarKeyguardViewManager { } else { mContainer.setSystemUiVisibility(vis | View.STATUS_BAR_DISABLE_BACK); } - if (!(mShowing && !mOccluded) || mBouncer.isShowing()) { - mPhoneStatusBar.getNavigationBarView().setVisibility(View.VISIBLE); - } else { - mPhoneStatusBar.getNavigationBarView().setVisibility(View.GONE); + if (mPhoneStatusBar.getNavigationBarView() != null) { + if (!(mShowing && !mOccluded) || mBouncer.isShowing()) { + mPhoneStatusBar.getNavigationBarView().setVisibility(View.VISIBLE); + } else { + mPhoneStatusBar.getNavigationBarView().setVisibility(View.GONE); + } } }