commit 35315bdbc90d946ede8fda4c88c843cd35c49854
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 10 00:54:45 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 10 00:54:45 2018 +0000
tree e00e0d257b9896253712f2a8997226537cf3ecff
parent bcca0c07702cdbc861b9b97e045d2c64d47e8d35
parent 5a25020d4b1ef2fc04c3341822555ea89df61234

Merge "Prevent nav mode from being -1 to avoid crash"

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

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 0b5871e..6bccf31 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 */,