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

Commit b07f6e09 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE."

parents 795a5f04 d9283b90

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

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ public class NavigationBarView extends LinearLayout { 
    };



    public void setDisabledFlags(int disabledFlags) {

        Slog.d(TAG, "setDisabledFlags: " + disabledFlags);

        setDisabledFlags(disabledFlags, false);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ public class PhoneStatusBar extends StatusBar { 


        if ((diff & (StatusBarManager.DISABLE_NAVIGATION | StatusBarManager.DISABLE_BACK)) != 0) {

            // the nav bar will take care of DISABLE_NAVIGATION and DISABLE_BACK

            mNavigationBarView.setDisabledFlags(state);

            if (mNavigationBarView != null) mNavigationBarView.setDisabledFlags(state);



            if ((state & StatusBarManager.DISABLE_NAVIGATION) != 0) {

                // close recents if it's visible