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

Commit bb042042 authored by Matthew Ng's avatar Matthew Ng
Browse files

Prevent npe when rotation button is not attached to screen 

This occurs when swapping nav bar to use the handle

Test: manual
Fixes: 128283080
Change-Id: Ifd86f5f71436538869b8313a79382229c1b06e86
parent 090f646c

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

+19 −5
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ public class RotationContextButton extends ContextualButton { 
    private final Stub mRotationWatcher = new Stub() {

        @Override

        public void onRotationChanged(final int rotation) throws RemoteException {

            if (getCurrentView() == null) {

                return;

            }



            // We need this to be scheduled as early as possible to beat the redrawing of

            // window in response to the orientation change.

            Handler h = getCurrentView().getHandler();
@@ -235,7 +239,9 @@ public class RotationContextButton extends ContextualButton { 


        // If window rotation matches suggested rotation, remove any current suggestions

        if (rotation == windowRotation) {

            if (getCurrentView() != null) {

                getCurrentView().removeCallbacks(mRemoveRotationProposal);

            }

            setRotateSuggestionButtonState(false /* visible */);

            return;

        }
@@ -259,11 +265,13 @@ public class RotationContextButton extends ContextualButton { 
            // If the navbar isn't shown, flag the rotate icon to be shown should the navbar become

            // visible given some time limit.

            mPendingRotationSuggestion = true;

            if (getCurrentView() != null) {

                getCurrentView().removeCallbacks(mCancelPendingRotationProposal);

                getCurrentView().postDelayed(mCancelPendingRotationProposal,

                        NAVBAR_HIDDEN_PENDING_ICON_TIMEOUT_MS);

            }

        }

    }



    public void onDisable2FlagChanged(int state2) {

        final boolean rotateSuggestionsDisabled = hasDisable2RotateSuggestionFlag(state2);
@@ -328,8 +336,10 @@ public class RotationContextButton extends ContextualButton { 
    private void onRotationSuggestionsDisabled() {

        // Immediately hide the rotate button and clear any planned removal

        setRotateSuggestionButtonState(false /* visible */, true /* force */);

        if (getCurrentView() != null) {

            getCurrentView().removeCallbacks(mRemoveRotationProposal);

        }

    }



    private void showAndLogRotationSuggestion() {

        setRotateSuggestionButtonState(true /* visible */);
@@ -361,6 +371,10 @@ public class RotationContextButton extends ContextualButton { 
    }



    private void rescheduleRotationTimeout(final boolean reasonHover) {

        if (getCurrentView() == null) {

            return;

        }



        // May be called due to a new rotation proposal or a change in hover state

        if (reasonHover) {

            // Don't reschedule if a hide animator is running