Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35315bdb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents bcca0c07 5a25020d

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

+4 −1
Original line number Diff line number Diff line
@@ -641,9 +641,12 @@ public class NavigationBarFragment extends Fragment implements Callbacks { 
    // 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 */,