Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null check on navigation bar visibility

Browse Source 
When there are hardware keys getNavigationBarView() returns null,
this just checks before setting the visibility.

Bug: 14491311
Change-Id: I2ea8b62b1dfe05ca09636870b37dff184730369e
This commit is contained in:
Jason Monk
2014-05-02 16:06:20 -04:00
parent e463c745ef
commit 1e68fb3c38
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

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