Merge "Remove AuthDialog and AuthDialogCallback Reasons" into main (6830d67c) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+5 −4

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.res.Configuration
		import android.hardware.biometrics.BiometricAuthenticator
		import android.hardware.biometrics.BiometricConstants
		import android.hardware.biometrics.BiometricManager
		import android.hardware.biometrics.BiometricPrompt
		import android.hardware.biometrics.PromptContentViewWithMoreOptionsButton
		import android.hardware.biometrics.PromptInfo
		import android.hardware.biometrics.PromptVerticalListContentView
		@@ -290,7 +291,7 @@ open class AuthContainerViewTest : SysuiTestCase() {

		verify(callback)
		.onDismissed(
		eq(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED),
		eq(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED),
		eq<ByteArray?>(null), /* credentialAttestation */
		eq(authContainer?.requestId ?: 0L),
		)
		@@ -310,7 +311,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
		)
		verify(callback)
		.onDismissed(
		eq(AuthDialogCallback.DISMISSED_USER_CANCELED),
		eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL),
		eq<ByteArray?>(null), /* credentialAttestation */
		eq(authContainer?.requestId ?: 0L),
		)
		@@ -325,7 +326,7 @@ open class AuthContainerViewTest : SysuiTestCase() {

		verify(callback)
		.onDismissed(
		eq(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE),
		eq(BiometricPrompt.DISMISSED_REASON_NEGATIVE),
		eq<ByteArray?>(null), /* credentialAttestation */
		eq(authContainer?.requestId ?: 0L),
		)
		@@ -352,7 +353,7 @@ open class AuthContainerViewTest : SysuiTestCase() {

		verify(callback)
		.onDismissed(
		eq(AuthDialogCallback.DISMISSED_ERROR),
		eq(BiometricPrompt.DISMISSED_REASON_ERROR),
		eq<ByteArray?>(null), /* credentialAttestation */
		eq(authContainer?.requestId ?: 0L),
		)

packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java

+16 −16

Original line number	Diff line number	Diff line
		@@ -138,9 +138,9 @@ public class AuthControllerTest extends SysuiTestCase {
		@Mock
		private IBiometricContextListener mContextListener;
		@Mock
		private AuthDialog mDialog1;
		private AuthContainerView mDialog1;
		@Mock
		private AuthDialog mDialog2;
		private AuthContainerView mDialog2;
		@Mock
		private CommandQueue mCommandQueue;
		@Mock
		@@ -382,7 +382,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonUserCanceled_whenDismissedByUserCancel() throws Exception {
		showDialog(new int[]{1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -393,7 +393,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonNegative_whenDismissedByButtonNegative() throws Exception {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_NEGATIVE,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -404,7 +404,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonConfirmed_whenDismissedByButtonPositive() throws Exception {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -415,7 +415,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonConfirmNotRequired_whenDismissedByAuthenticated() throws Exception {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -426,7 +426,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonError_whenDismissedByError() throws Exception {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_ERROR,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_ERROR,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -437,7 +437,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonServerRequested_whenDismissedByServer() throws Exception {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -452,7 +452,7 @@ public class AuthControllerTest extends SysuiTestCase {

		final byte[] credentialAttestation = generateRandomHAT();

		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED,
		credentialAttestation, mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		eq(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED),
		@@ -462,7 +462,7 @@ public class AuthControllerTest extends SysuiTestCase {
		@Test
		public void testSendsReasonContentViewMoreOptions_whenButtonPressed() throws Exception {
		showDialog(new int[]{1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS,
		null, /* credentialAttestation */
		mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		@@ -696,7 +696,7 @@ public class AuthControllerTest extends SysuiTestCase {

		final byte[] credentialAttestation = generateRandomHAT();

		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED,
		credentialAttestation, mAuthController.mCurrentDialog.getRequestId());
		verify(mReceiver).onDialogDismissed(
		eq(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED),
		@@ -755,7 +755,7 @@ public class AuthControllerTest extends SysuiTestCase {
		public void testDoesNotCrash_whenTryAgainPressedAfterDismissal() {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		final long requestID = mAuthController.mCurrentDialog.getRequestId();
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
		null, /* credentialAttestation */requestID);
		mAuthController.onTryAgainPressed(requestID);
		}
		@@ -764,7 +764,7 @@ public class AuthControllerTest extends SysuiTestCase {
		public void testDoesNotCrash_whenDeviceCredentialPressedAfterDismissal() {
		showDialog(new int[] {1} /* sensorIds /, false / credentialAllowed */);
		final long requestID = mAuthController.mCurrentDialog.getRequestId();
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
		null /* credentialAttestation */, requestID);
		mAuthController.onDeviceCredentialPressed(requestID);
		}
		@@ -818,7 +818,7 @@ public class AuthControllerTest extends SysuiTestCase {

		// WHEN dialog is shown and then dismissed
		showDialog(new int[]{1} /* sensorIds /, false / credentialAllowed */);
		mAuthController.onDismissed(AuthDialogCallback.DISMISSED_USER_CANCELED,
		mAuthController.onDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
		null /* credentialAttestation */,
		mAuthController.mCurrentDialog.getRequestId());

		@@ -1218,14 +1218,14 @@ public class AuthControllerTest extends SysuiTestCase {
		}

		@Override
		protected AuthDialog buildDialog(DelayableExecutor bgExecutor, PromptInfo promptInfo,
		protected AuthContainerView buildDialog(DelayableExecutor bgExecutor, PromptInfo promptInfo,
		boolean requireConfirmation, int userId, int[] sensorIds,
		String opPackageName, boolean skipIntro, long operationId, long requestId,
		WakefulnessLifecycle wakefulnessLifecycle,
		UserManager userManager,
		LockPatternUtils lockPatternUtils, PromptViewModel viewModel) {

		AuthDialog dialog;
		AuthContainerView dialog;
		if (mBuildCount == 0) {
		dialog = mDialog1;
		} else if (mBuildCount == 1) {

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

+17 −34

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.graphics.PixelFormat;
		import android.hardware.biometrics.BiometricAuthenticator.Modality;
		import android.hardware.biometrics.BiometricConstants;
		import android.hardware.biometrics.BiometricManager.Authenticators;
		import android.hardware.biometrics.BiometricPrompt;
		import android.hardware.biometrics.PromptInfo;
		import android.hardware.face.FaceSensorPropertiesInternal;
		import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
		@@ -100,7 +101,7 @@ import javax.inject.Provider;
		*/
		@Deprecated
		public class AuthContainerView extends LinearLayout
		implements AuthDialog, WakefulnessLifecycle.Observer, CredentialView.Host {
		implements WakefulnessLifecycle.Observer, CredentialView.Host {

		private static final String TAG = "AuthContainerView";

		@@ -158,12 +159,11 @@ public class AuthContainerView extends LinearLayout
		private final Set<Integer> mFailedModalities = new HashSet<Integer>();
		private final OnBackInvokedCallback mBackCallback = this::onBackInvoked;

		private final @Background DelayableExecutor mBackgroundExecutor;

		private final MSDLPlayer mMSDLPlayer;

		// Non-null only if the dialog is in the act of dismissing and has not sent the reason yet.
		@Nullable @AuthDialogCallback.DismissedReason private Integer mPendingCallbackReason;
		@Nullable @BiometricPrompt.DismissedReason private Integer mPendingCallbackReason;
		// HAT received from LockSettingsService when credential is verified.
		@Nullable private byte[] mCredentialAttestation;

		@@ -188,18 +188,18 @@ public class AuthContainerView extends LinearLayout
		final class BiometricCallback implements Spaghetti.Callback {
		@Override
		public void onAuthenticated() {
		animateAway(AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED);
		animateAway(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED);
		}

		@Override
		public void onUserCanceled() {
		sendEarlyUserCanceled();
		animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
		animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
		}

		@Override
		public void onButtonNegative() {
		animateAway(AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE);
		animateAway(BiometricPrompt.DISMISSED_REASON_NEGATIVE);
		}

		@Override
		@@ -210,12 +210,12 @@ public class AuthContainerView extends LinearLayout

		@Override
		public void onContentViewMoreOptionsButtonPressed() {
		animateAway(AuthDialogCallback.DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS);
		animateAway(BiometricPrompt.DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS);
		}

		@Override
		public void onError() {
		animateAway(AuthDialogCallback.DISMISSED_ERROR);
		animateAway(BiometricPrompt.DISMISSED_REASON_ERROR);
		}

		@Override
		@@ -234,20 +234,20 @@ public class AuthContainerView extends LinearLayout

		@Override
		public void onAuthenticatedAndConfirmed() {
		animateAway(AuthDialogCallback.DISMISSED_BUTTON_POSITIVE);
		animateAway(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED);
		}
		}

		@Override
		public void onCredentialMatched(@NonNull byte[] attestation) {
		mCredentialAttestation = attestation;
		animateAway(AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED);
		animateAway(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED);
		}

		@Override
		public void onCredentialAborted() {
		sendEarlyUserCanceled();
		animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
		animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
		}

		@Override
		@@ -277,7 +277,7 @@ public class AuthContainerView extends LinearLayout
		com.android.settingslib.R.string.failed_attempts_now_wiping_dialog_dismiss,
		null /* OnClickListener */)
		.setOnDismissListener(
		dialog -> animateAway(AuthDialogCallback.DISMISSED_ERROR))
		dialog -> animateAway(BiometricPrompt.DISMISSED_REASON_ERROR))
		.create();
		alertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);
		alertDialog.show();
		@@ -349,7 +349,6 @@ public class AuthContainerView extends LinearLayout

		mPanelView = mLayout.findViewById(R.id.panel);
		mPanelController = new AuthPanelController(mContext, mPanelView);
		mBackgroundExecutor = bgExecutor;
		mInteractionJankMonitor = jankMonitor;
		mCredentialViewModelProvider = credentialViewModelProvider;

		@@ -394,7 +393,7 @@ public class AuthContainerView extends LinearLayout
		@VisibleForTesting
		public void onBackInvoked() {
		sendEarlyUserCanceled();
		animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
		animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
		}

		void sendEarlyUserCanceled() {
		@@ -402,7 +401,6 @@ public class AuthContainerView extends LinearLayout
		BiometricConstants.BIOMETRIC_SYSTEM_EVENT_EARLY_USER_CANCEL, getRequestId());
		}

		@Override
		public boolean isAllowDeviceCredentials() {
		return Utils.isDeviceCredentialAllowed(mConfig.mPromptInfo);
		}
		@@ -450,7 +448,6 @@ public class AuthContainerView extends LinearLayout
		mPanelController.setContainerDimensions(getMeasuredWidth(), getMeasuredHeight());
		}

		@Override
		public void onOrientationChanged() {
		}

		@@ -538,10 +535,9 @@ public class AuthContainerView extends LinearLayout

		@Override
		public void onStartedGoingToSleep() {
		animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
		animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
		}

		@Override
		public void show(WindowManager wm) {
		wm.addView(this, getLayoutParams(mWindowToken, mConfig.mPromptInfo.getTitle()));
		}
		@@ -559,7 +555,6 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public void dismissWithoutCallback(boolean animate) {
		if (animate) {
		animateAway(false /* sendReason /, 0 / reason */);
		@@ -569,12 +564,10 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public void dismissFromSystemServer() {
		animateAway(false /* sendReason /, 0 / reason */);
		}

		@Override
		public void onAuthenticationSucceeded(@Modality int modality) {
		if (mBiometricView != null) {
		mBiometricView.onAuthenticationSucceeded(modality);
		@@ -583,7 +576,6 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public void onAuthenticationFailed(@Modality int modality, String failureReason) {
		if (mBiometricView != null) {
		mFailedModalities.add(modality);
		@@ -593,7 +585,6 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public void onHelp(@Modality int modality, String help) {
		if (mBiometricView != null) {
		mBiometricView.onHelp(modality, help);
		@@ -602,7 +593,6 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public void onError(@Modality int modality, String error) {
		if (mBiometricView != null) {
		mBiometricView.onError(modality, error);
		@@ -611,7 +601,6 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public void onPointerDown() {
		if (mBiometricView != null) {
		if (mFailedModalities.contains(TYPE_FACE)) {
		@@ -624,22 +613,18 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public String getOpPackageName() {
		return mConfig.mOpPackageName;
		}

		@Override
		public String getClassNameIfItIsConfirmDeviceCredentialActivity() {
		return mConfig.mPromptInfo.getClassNameIfItIsConfirmDeviceCredentialActivity();
		}

		@Override
		public long getRequestId() {
		return mConfig.mRequestId;
		}

		@Override
		public void animateToCredentialUI(boolean isError) {
		if (mBiometricView != null) {
		mBiometricView.startTransitionToCredentialUI(isError);
		@@ -648,11 +633,11 @@ public class AuthContainerView extends LinearLayout
		}
		}

		void animateAway(@AuthDialogCallback.DismissedReason int reason) {
		void animateAway(@BiometricPrompt.DismissedReason int reason) {
		animateAway(true /* sendReason */, reason);
		}

		private void animateAway(boolean sendReason, @AuthDialogCallback.DismissedReason int reason) {
		private void animateAway(boolean sendReason, @BiometricPrompt.DismissedReason int reason) {
		if (mContainerState == STATE_ANIMATING_IN) {
		Log.w(TAG, "startDismiss(): waiting for onDialogAnimatedIn");
		mContainerState = STATE_PENDING_DISMISS;
		@@ -732,7 +717,7 @@ public class AuthContainerView extends LinearLayout
		private void onDialogAnimatedIn() {
		if (mContainerState == STATE_PENDING_DISMISS) {
		Log.d(TAG, "onDialogAnimatedIn(): mPendingDismissDialog=true, dismissing now");
		animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
		animateAway(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);
		return;
		}
		if (mContainerState == STATE_ANIMATING_OUT \|\| mContainerState == STATE_GONE) {
		@@ -748,7 +733,6 @@ public class AuthContainerView extends LinearLayout
		}
		}

		@Override
		public PromptViewModel getViewModel() {
		return mPromptViewModel;
		}
		@@ -776,7 +760,6 @@ public class AuthContainerView extends LinearLayout
		return lp;
		}

		@Override
		public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
		pw.println(" isAttachedToWindow=" + isAttachedToWindow());
		pw.println(" containerState=" + mContainerState);

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

+10 −56

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ public class AuthController implements
		// TODO: These should just be saved from onSaveState
		private SomeArgs mCurrentDialogArgs;
		@VisibleForTesting
		AuthDialog mCurrentDialog;
		AuthContainerView mCurrentDialog;

		@NonNull private final WindowManager mWindowManager;
		@NonNull private final DisplayManager mDisplayManager;
		@@ -222,7 +222,7 @@ public class AuthController implements
		closeDialog(BiometricPrompt.DISMISSED_REASON_USER_CANCEL, reasonString);
		}

		private void closeDialog(@DismissedReason int reason, String reasonString) {
		private void closeDialog(@BiometricPrompt.DismissedReason int reason, String reasonString) {
		if (isShowing()) {
		Log.i(TAG, "Close BP, reason :" + reasonString);
		mCurrentDialog.dismissWithoutCallback(true /* animate */);
		@@ -511,60 +511,14 @@ public class AuthController implements
		}

		@Override
		public void onDismissed(@DismissedReason int reason,
		public void onDismissed(@BiometricPrompt.DismissedReason int reason,
		@Nullable byte[] credentialAttestation, long requestId) {

		if (mCurrentDialog != null && requestId != mCurrentDialog.getRequestId()) {
		Log.w(TAG, "requestId doesn't match, skip onDismissed");
		return;
		}

		switch (reason) {
		case AuthDialogCallback.DISMISSED_USER_CANCELED:
		sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_USER_CANCEL,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_BUTTON_NEGATIVE:
		sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_NEGATIVE,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_BUTTON_POSITIVE:
		sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRMED,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_BIOMETRIC_AUTHENTICATED:
		sendResultAndCleanUp(
		BiometricPrompt.DISMISSED_REASON_BIOMETRIC_CONFIRM_NOT_REQUIRED,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_ERROR:
		sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_ERROR,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_BY_SYSTEM_SERVER:
		sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_SERVER_REQUESTED,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_CREDENTIAL_AUTHENTICATED:
		sendResultAndCleanUp(BiometricPrompt.DISMISSED_REASON_CREDENTIAL_CONFIRMED,
		credentialAttestation);
		break;

		case AuthDialogCallback.DISMISSED_BUTTON_CONTENT_VIEW_MORE_OPTIONS:
		sendResultAndCleanUp(
		BiometricPrompt.DISMISSED_REASON_CONTENT_VIEW_MORE_OPTIONS,
		credentialAttestation);
		break;
		default:
		Log.e(TAG, "Unhandled reason: " + reason);
		break;
		}
		sendResultAndCleanUp(reason, credentialAttestation);
		}

		@Override
		@@ -699,7 +653,7 @@ public class AuthController implements
		mUdfpsController.onAodInterrupt(screenX, screenY, major, minor);
		}

		private void sendResultAndCleanUp(@DismissedReason int reason,
		private void sendResultAndCleanUp(@BiometricPrompt.DismissedReason int reason,
		@Nullable byte[] credentialAttestation) {
		if (mReceiver == null) {
		Log.e(TAG, "sendResultAndCleanUp: Receiver is null");
		@@ -1244,7 +1198,7 @@ public class AuthController implements
		final long requestId = args.argl2;

		// Create a new dialog but do not replace the current one yet.
		final AuthDialog newDialog = buildDialog(
		final AuthContainerView newDialog = buildDialog(
		mBackgroundExecutor,
		promptInfo,
		requireConfirmation,
		@@ -1327,7 +1281,7 @@ public class AuthController implements
		return mContext.createDisplayContext(display).getSystemService(WindowManager.class);
		}

		private void onDialogDismissed(@DismissedReason int reason) {
		private void onDialogDismissed(@BiometricPrompt.DismissedReason int reason) {
		if (DEBUG) Log.d(TAG, "onDialogDismissed: " + reason);
		if (mCurrentDialog == null) {
		Log.w(TAG, "Dialog already dismissed");
		@@ -1361,7 +1315,7 @@ public class AuthController implements
		}
		}

		protected AuthDialog buildDialog(@Background DelayableExecutor bgExecutor,
		protected AuthContainerView buildDialog(@Background DelayableExecutor bgExecutor,
		PromptInfo promptInfo, boolean requireConfirmation, int userId, int[] sensorIds,
		String opPackageName, boolean skipIntro, long operationId, long requestId,
		@NonNull WakefulnessLifecycle wakefulnessLifecycle,
		@@ -1389,7 +1343,7 @@ public class AuthController implements

		@Override
		public void dump(@NonNull PrintWriter pw, @NonNull String[] args) {
		final AuthDialog dialog = mCurrentDialog;
		final AuthContainerView dialog = mCurrentDialog;
		pw.println(" mCachedDisplayInfo=" + mCachedDisplayInfo);
		pw.println(" mScaleFactor=" + mScaleFactor);
		pw.println(" fingerprintSensorLocationInNaturalOrientation="

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

deleted100644 → 0

+0 −125

File deleted.

Preview size limit exceeded, changes collapsed.