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

Commit 776d07b3 authored Mar 02, 2023 by Diya Bera Committed by Automerger Merge Worker Mar 02, 2023

Merge "Converting HAL power press to Framework power press" into udc-dev am: 84f97a8b

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

Change-Id: I3a89350afa764e1db335b8f9bb06eb04f3223d13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c938bfbc 84f97a8b

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();