diff options
| author | Jason Monk <jmonk@google.com> | 2014-05-02 16:06:20 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-05-02 16:06:20 -0400 |
| commit | 1e68fb3c3842bb90ed3f474cef0ddf7116eace0e (patch) | |
| tree | 2ece53459a10c62294d40834d79d2245544942d5 | |
| parent | e463c745ef6901121837e88ca8597d062843b9dd (diff) | |
| download | frameworks_base-1e68fb3c3842bb90ed3f474cef0ddf7116eace0e.zip frameworks_base-1e68fb3c3842bb90ed3f474cef0ddf7116eace0e.tar.gz frameworks_base-1e68fb3c3842bb90ed3f474cef0ddf7116eace0e.tar.bz2 | |
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
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 10 |
1 files 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 c2595cf..db244fe 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); + } } } |