Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Diya Bera
2023-03-02 02:22:13 +00:00
committed by Automerger Merge Worker
parent c938bfbc3c 84f97a8b13
commit 776d07b3ff
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -274,8 +274,5 @@ class FingerprintEnrollClient extends EnrollClient<AidlSession> implements Udfps
} }
@Override @Override
public void onPowerPressed() { public void onPowerPressed() {}
onAcquired(BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_POWER_PRESSED,
0 /* vendorCode */);
}
} }

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

@@ -273,16 +273,6 @@ public class FingerprintEnrollClientTest {
showHideOverlay(c -> c.onEnrollResult(new Fingerprint("", 1, 1), 0)); 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) private void showHideOverlay(Consumer<FingerprintEnrollClient> block)
throws RemoteException { throws RemoteException {
final FingerprintEnrollClient client = createClient(); final FingerprintEnrollClient client = createClient();