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

Commit edcb3ea8 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Enable orientation listener at all times." into sc-dev am: c9564dd9 

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

Change-Id: I0858af49ee8df2c61c696dd1ead188e4d3a6e0d5
parents 797cc34e c9564dd9

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+7 −8
Original line number Diff line number Diff line
@@ -121,11 +121,15 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
    }



    private class BiometricOrientationEventListener extends OrientationEventListener {

        @Surface.Rotation private int mLastRotation;

        @Surface.Rotation private int mLastRotation = ORIENTATION_UNKNOWN;



        BiometricOrientationEventListener(Context context) {

            super(context);

            mLastRotation = context.getDisplay().getRotation();



            final Display display = context.getDisplay();

            if (display != null) {

                mLastRotation = display.getRotation();

            }

        }



        @Override
@@ -200,7 +204,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
                Log.w(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received");

                mCurrentDialog.dismissWithoutCallback(true /* animate */);

                mCurrentDialog = null;

                mOrientationListener.disable();



                try {

                    if (mReceiver != null) {
@@ -229,7 +232,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
                        Log.w(TAG, "Evicting client due to: " + topPackage);

                        mCurrentDialog.dismissWithoutCallback(true /* animate */);

                        mCurrentDialog = null;

                        mOrientationListener.disable();



                        if (mReceiver != null) {

                            mReceiver.onDialogDismissed(
@@ -469,6 +471,7 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        mSidefpsControllerFactory = sidefpsControllerFactory;

        mWindowManager = windowManager;

        mOrientationListener = new BiometricOrientationEventListener(context);

        mOrientationListener.enable();



        mFaceProps = mFaceManager != null ? mFaceManager.getSensorPropertiesInternal() : null;
@@ -663,7 +666,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        // BiometricService will have already sent the callback to the client in this case.

        // This avoids a round trip to SystemUI. So, just dismiss the dialog and we're done.

        mCurrentDialog = null;

        mOrientationListener.disable();

    }



    /**
@@ -735,7 +737,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        mReceiver = (IBiometricSysuiReceiver) args.arg2;

        mCurrentDialog = newDialog;

        mCurrentDialog.show(mWindowManager, savedState);

        mOrientationListener.enable();

    }



    private void onDialogDismissed(@DismissedReason int reason) {
@@ -745,7 +746,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        }

        mReceiver = null;

        mCurrentDialog = null;

        mOrientationListener.disable();

    }



    @Override
@@ -758,7 +758,6 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
            mCurrentDialog.onSaveState(savedState);

            mCurrentDialog.dismissWithoutCallback(false /* animate */);

            mCurrentDialog = null;

            mOrientationListener.disable();



            // Only show the dialog if necessary. If it was animating out, the dialog is supposed

            // to send its pending callback immediately.