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

Commit 940223d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if navBar is null onRotationProposal()" into sc-dev am: b1f1110d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13606134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4c14304c8b682191fae89039fddc5f44852f3b5
parents 8644289d b1f1110d

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+8 −0
Original line number Diff line number Diff line
@@ -855,6 +855,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    @Override

    public void onRotationProposal(final int rotation, boolean isValid) {

        if (mNavigationBarView == null) {

            if (RotationContextButton.DEBUG_ROTATION) {

                Log.v(TAG, "onRotationProposal proposedRotation=" +

                        Surface.rotationToString(rotation) + ", mNavigationBarView is null");

            }

            return;

        }



        final int winRotation = mNavigationBarView.getDisplay().getRotation();

        final boolean rotateSuggestionsDisabled = RotationButtonController

                .hasDisable2RotateSuggestionFlag(mDisabledFlags2);