Merge "Revert "Handling power press messages sent from the HAL"" (29297912) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/sensors/SensorOverlays.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -149,13 +149,6 @@ public final class SensorOverlays {
		}
		}

		/**
		* Returns if the sensor is side fps.
		*/
		public boolean isSfps() {
		return mSidefpsController.isPresent();
		}

		/**
		* Consumer for a biometric overlay controller.
		*

+2 −8

Original line number	Diff line number	Diff line
		@@ -236,14 +236,8 @@ class FingerprintAuthenticationClient extends AuthenticationClient<AidlSession>

		@Override
		public void onError(int errorCode, int vendorCode) {
		if (errorCode == BiometricFingerprintConstants.FINGERPRINT_ERROR_VENDOR
		&& vendorCode == BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED
		&& mSensorOverlays.isSfps()) {
		super.onError(BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED,
		0 /* vendorCode */);
		} else {
		super.onError(errorCode, vendorCode);
		}

		if (errorCode == BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBRATION) {
		BiometricNotificationUtils.showBadCalibrationNotification(getContext());
		}

+5 −9

Original line number	Diff line number	Diff line
		@@ -146,15 +146,8 @@ class FingerprintEnrollClient extends EnrollClient<AidlSession> implements Udfps
		}
		});
		mCallback.onBiometricAction(BiometricStateListener.ACTION_SENSOR_TOUCH);
		if (acquiredInfo == BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR
		&& vendorCode == BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED
		&& mSensorOverlays.isSfps()) {
		super.onAcquired(BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED,
		0 /* vendorCode */);
		} else {
		super.onAcquired(acquiredInfo, vendorCode);
		}
		}

		@Override
		public void onError(int errorCode, int vendorCode) {
		@@ -281,5 +274,8 @@ class FingerprintEnrollClient extends EnrollClient<AidlSession> implements Udfps
		}

		@Override
		public void onPowerPressed() { }
		public void onPowerPressed() {
		onAcquired(BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED,
		0 /* vendorCode */);
		}
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import static org.mockito.Mockito.when;
		import android.app.ActivityManager;
		import android.app.ActivityTaskManager;
		import android.content.ComponentName;
		import android.hardware.biometrics.BiometricFingerprintConstants;
		import android.hardware.biometrics.BiometricManager;
		import android.hardware.biometrics.common.ICancellationSignal;
		import android.hardware.biometrics.common.OperationContext;
		@@ -365,16 +364,6 @@ public class FingerprintAuthenticationClientTest {
		showHideOverlay(c -> c.onLockoutPermanent());
		}

		@Test
		public void testPowerPressForwardsErrorMessage() throws RemoteException {
		final FingerprintAuthenticationClient client = createClient();

		client.onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_VENDOR,
		BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED);

		verify(mClientMonitorCallbackConverter).onError(anyInt(), anyInt(),
		eq(BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED), eq(0));
		}
		private void showHideOverlay(Consumer<FingerprintAuthenticationClient> block)
		throws RemoteException {
		final FingerprintAuthenticationClient client = createClient();

+5 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.biometrics.sensors.fingerprint.aidl;

		import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED;

		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyFloat;
		import static org.mockito.ArgumentMatchers.anyInt;
		@@ -27,7 +29,6 @@ import static org.mockito.Mockito.same;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.hardware.biometrics.BiometricFingerprintConstants;
		import android.hardware.biometrics.common.OperationContext;
		import android.hardware.biometrics.fingerprint.ISession;
		import android.hardware.biometrics.fingerprint.PointerContext;
		@@ -275,12 +276,11 @@ public class FingerprintEnrollClientTest {
		@Test
		public void testPowerPressForwardsAcquireMessage() throws RemoteException {
		final FingerprintEnrollClient client = createClient();

		client.onAcquired(BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR,
		BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED);
		client.start(mCallback);
		client.onPowerPressed();

		verify(mClientMonitorCallbackConverter).onAcquired(anyInt(),
		eq(BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED), eq(0));
		eq(FINGERPRINT_ACQUIRED_POWER_PRESSED), anyInt());
		}

		private void showHideOverlay(Consumer<FingerprintEnrollClient> block)