Merge "Revert "Do not show side fingerprint sensor overlay when used from... (7f1538b2) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/BiometricOverlayConstants.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -38,16 +38,13 @@ public interface BiometricOverlayConstants {
		int REASON_AUTH_KEYGUARD = 4;
		/** Non-specific usage (from FingerprintManager). */
		int REASON_AUTH_OTHER = 5;
		/** Usage from Settings. */
		int REASON_AUTH_SETTINGS = 6;

		@IntDef({REASON_UNKNOWN,
		REASON_ENROLL_FIND_SENSOR,
		REASON_ENROLL_ENROLLING,
		REASON_AUTH_BP,
		REASON_AUTH_KEYGUARD,
		REASON_AUTH_OTHER,
		REASON_AUTH_SETTINGS})
		REASON_AUTH_OTHER})
		@Retention(RetentionPolicy.SOURCE)
		@interface ShowReason {}
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.graphics.PorterDuffColorFilter
		import android.graphics.Rect
		import android.hardware.biometrics.BiometricOverlayConstants
		import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD
		import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_SETTINGS
		import android.hardware.display.DisplayManager
		import android.hardware.fingerprint.FingerprintManager
		import android.hardware.fingerprint.FingerprintSensorPropertiesInternal
		@@ -182,7 +181,6 @@ class SidefpsController @Inject constructor(
		@BiometricOverlayConstants.ShowReason
		private fun Int.isReasonToShow(): Boolean = when (this) {
		REASON_AUTH_KEYGUARD -> false
		REASON_AUTH_SETTINGS -> false
		else -> true
		}

+1 −11

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.biometrics

		import android.graphics.Rect
		import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_KEYGUARD
		import android.hardware.biometrics.BiometricOverlayConstants.REASON_AUTH_SETTINGS
		import android.hardware.biometrics.BiometricOverlayConstants.REASON_UNKNOWN
		import android.hardware.biometrics.SensorProperties
		import android.hardware.display.DisplayManager
		@@ -183,16 +182,7 @@ class SidefpsControllerTest : SysuiTestCase() {

		@Test
		fun testIgnoredForKeyguard() {
		testIgnoredFor(REASON_AUTH_KEYGUARD)
		}

		@Test
		fun testIgnoredForSettings() {
		testIgnoredFor(REASON_AUTH_SETTINGS)
		}

		private fun testIgnoredFor(reason: Int) {
		overlayController.show(SENSOR_ID, reason)
		overlayController.show(SENSOR_ID, REASON_AUTH_KEYGUARD)
		executor.runAllReady()

		verify(windowManager, never()).addView(any(), any())

+0 −6

Original line number	Diff line number	Diff line
		@@ -168,10 +168,6 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T>
		return Utils.isKeyguard(getContext(), getOwnerString());
		}

		private boolean isSettings() {
		return Utils.isSettings(getContext(), getOwnerString());
		}

		@Override
		protected boolean isCryptoOperation() {
		return mOperationId != 0;
		@@ -503,8 +499,6 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T>
		protected int getShowOverlayReason() {
		if (isKeyguard()) {
		return BiometricOverlayConstants.REASON_AUTH_KEYGUARD;
		} else if (isSettings()) {
		return BiometricOverlayConstants.REASON_AUTH_SETTINGS;
		} else if (isBiometricPrompt()) {
		return BiometricOverlayConstants.REASON_AUTH_BP;
		} else {