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

Commit 64014612 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "PhoneStatusBar: Fix NPE when disabling navigation with no soft buttons."

parents 6f983a79 a7cf74cf

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

+14 −12
Original line number Diff line number Diff line
@@ -1125,6 +1125,7 @@ public class PhoneStatusBar extends StatusBar { 
        Slog.i(TAG, "DISABLE_BACK: " + (disableBack ? "yes" : "no"));

        Slog.i(TAG, "DISABLE_NAVIGATION: " + (disableNavigation ? "yes" : "no"));



        if (mNavigationBarView != null) {

            if (disableNavigation && disableBack) {

                mNavigationBarView.setEnabled(false);

            } else {
@@ -1132,14 +1133,15 @@ public class PhoneStatusBar extends StatusBar { 
                mNavigationBarView.getHomeButton().setEnabled(!disableNavigation);

                mNavigationBarView.getRecentsButton().setEnabled(!disableNavigation);



                mNavigationBarView.setEnabled(true);

            }

        }



        if (disableNavigation) {

            // close recents if it's visible

            mHandler.removeMessages(MSG_CLOSE_RECENTS_PANEL);

            mHandler.sendEmptyMessage(MSG_CLOSE_RECENTS_PANEL);

        }



            mNavigationBarView.setEnabled(true);

        }

    }



    /**