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

Commit fa608870 authored Feb 14, 2023 by Diya Bera

Converting HAL power press to Framework power press

Test: 	Manually checked behavior when power is pressed for:
	Biometric Prompt: an error is shown
	Keyguard authentication: nothing happens
	Fingerprint Enrollment: an acquired message is displayed

Bug: 269293986
Change-Id: I6eb1a4771429e21f4292592283ea8dddaf308582

parent 3a81bb04

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ final class AidlConversionUtils {
		return BiometricFingerprintConstants.FINGERPRINT_ERROR_VENDOR;
		} else if (aidlError == Error.BAD_CALIBRATION) {
		return BiometricFingerprintConstants.FINGERPRINT_ERROR_BAD_CALIBRATION;
		} else if (aidlError == Error.POWER_PRESS) {
		return BiometricFingerprintConstants.BIOMETRIC_ERROR_POWER_PRESSED;
		} else {
		return BiometricFingerprintConstants.FINGERPRINT_ERROR_UNKNOWN;
		}
		@@ -84,6 +86,8 @@ final class AidlConversionUtils {
		} else if (aidlAcquiredInfo == AcquiredInfo.RETRYING_CAPTURE) {
		// No framework constant available
		return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;
		} else if (aidlAcquiredInfo == AcquiredInfo.POWER_PRESS) {
		return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED;
		} else {
		return BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_UNKNOWN;
		}

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -274,8 +274,5 @@ class FingerprintEnrollClient extends EnrollClient<AidlSession> implements Udfps
		}

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

services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -273,16 +273,6 @@ public class FingerprintEnrollClientTest {
		showHideOverlay(c -> c.onEnrollResult(new Fingerprint("", 1, 1), 0));
		}

		@Test
		public void testPowerPressForwardsAcquireMessage() throws RemoteException {
		final FingerprintEnrollClient client = createClient();
		client.start(mCallback);
		client.onPowerPressed();

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

		private void showHideOverlay(Consumer<FingerprintEnrollClient> block)
		throws RemoteException {
		final FingerprintEnrollClient client = createClient();