Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1f6b8cf828a886b11d89ceef8c68970e40dc3cb1
This commit is contained in:
Joe Bolinger
2021-07-08 00:20:00 +00:00
committed by Automerger Merge Worker
parent bdd673a5d4 c9564dd9c1
commit 150afa731a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View File

@@ -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.