From fa608870850b353e354e6ee1c681f21629eb5ef3 Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Tue, 14 Feb 2023 21:45:42 +0000 Subject: [PATCH] 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 --- .../sensors/fingerprint/aidl/AidlConversionUtils.java | 4 ++++ .../fingerprint/aidl/FingerprintEnrollClient.java | 5 +---- .../fingerprint/aidl/FingerprintEnrollClientTest.java | 10 ---------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java index 1630be77ee7b4..bae84bd01e055 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/AidlConversionUtils.java @@ -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; } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java index 513b3e3e6e86c..c2ca78e91fe32 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java @@ -274,8 +274,5 @@ class FingerprintEnrollClient extends EnrollClient implements Udfps } @Override - public void onPowerPressed() { - onAcquired(BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED, - 0 /* vendorCode */); - } + public void onPowerPressed() {} } diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java index 26524d7df7c3d..7646c401193f1 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClientTest.java @@ -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 block) throws RemoteException { final FingerprintEnrollClient client = createClient();