Prevent nav mode from being -1 to avoid crash
Computing the nav mode would return -1 if there were no difference in
sys ui new and old bar mode. When dumping the data from nav bar, it
would crash if bar mode was -1 and there is no static constant for -1
bar mode. Therefore prevent setting -1 as a valid bar mode.
Test: manual
Change-Id: I9747f7aa7273b4bc05d26b08130818f059645187
Fixes: 117324620
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
index 9c579da..ac2ffcc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
@@ -641,9 +641,12 @@
// Injected from StatusBar at creation.
public void setCurrentSysuiVisibility(int systemUiVisibility) {
mSystemUiVisibility = systemUiVisibility;
- mNavigationBarMode = mStatusBar.computeBarMode(0, mSystemUiVisibility,
+ final int barMode = mStatusBar.computeBarMode(0, mSystemUiVisibility,
View.NAVIGATION_BAR_TRANSIENT, View.NAVIGATION_BAR_TRANSLUCENT,
View.NAVIGATION_BAR_TRANSPARENT);
+ if (barMode != -1) {
+ mNavigationBarMode = barMode;
+ }
checkNavBarModes();
mStatusBar.touchAutoHide();
mLightBarController.onNavigationVisibilityChanged(mSystemUiVisibility, 0 /* mask */,