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

Merge "Fix the broken callback linkage of onAcquired()" into udc-dev

Browse Source
This commit is contained in:
Jeff Pu
2023-04-10 17:53:32 +00:00
committed by Android (Google) Code Review
parent c0ff8e9672 d3ba40054b
commit c6e0ac76d3
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/biometrics/AuthSession.java
View File

@@ -19,6 +19,8 @@ package com.android.server.biometrics;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_NONE;
import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR;
import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_VENDOR_BASE;
import static android.hardware.biometrics.BiometricManager.BIOMETRIC_MULTI_SENSOR_DEFAULT;
import static android.hardware.biometrics.BiometricManager.BIOMETRIC_MULTI_SENSOR_FINGERPRINT_AND_FACE;
@@ -519,6 +521,9 @@ public final class AuthSession implements IBinder.DeathRecipient {
try {
mStatusBarService.onBiometricHelp(sensorIdToModality(sensorId), message);
final int aAcquiredInfo = acquiredInfo == FINGERPRINT_ACQUIRED_VENDOR
? (vendorCode + FINGERPRINT_ACQUIRED_VENDOR_BASE) : acquiredInfo;
mClientReceiver.onAcquired(aAcquiredInfo, message);
} catch (RemoteException e) {
Slog.e(TAG, "Remote exception", e);
}

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

@@ -413,6 +413,11 @@ public class FingerprintService extends SystemService {
Slog.e(TAG, "Remote exception in onAuthenticationAcquired()", e);
}
}
@Override
public void onAuthenticationHelp(int acquireInfo, CharSequence helpString) {
onAuthenticationAcquired(acquireInfo);
}
};
return biometricPrompt.authenticateForOperation(

31
services/tests/servicestests/src/com/android/server/biometrics/AuthSessionTest.java
View File

@@ -43,6 +43,7 @@ import android.annotation.NonNull;
import android.app.admin.DevicePolicyManager;
import android.app.trust.ITrustManager;
import android.content.Context;
import android.content.res.Resources;
import android.hardware.biometrics.BiometricManager.Authenticators;
import android.hardware.biometrics.IBiometricAuthenticator;
import android.hardware.biometrics.IBiometricSensorReceiver;
@@ -52,6 +53,7 @@ import android.hardware.biometrics.PromptInfo;
import android.hardware.biometrics.SensorProperties;
import android.hardware.face.FaceSensorProperties;
import android.hardware.face.FaceSensorPropertiesInternal;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorProperties;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Binder;
@@ -83,6 +85,7 @@ public class AuthSessionTest {
private static final long TEST_REQUEST_ID = 22;
@Mock private Context mContext;
@Mock private Resources mResources;
@Mock private BiometricContext mBiometricContext;
@Mock private ITrustManager mTrustManager;
@Mock private DevicePolicyManager mDevicePolicyManager;
@@ -104,6 +107,7 @@ public class AuthSessionTest {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
when(mContext.getResources()).thenReturn(mResources);
when(mClientReceiver.asBinder()).thenReturn(mock(Binder.class));
when(mBiometricContext.updateContext(any(), anyBoolean()))
.thenAnswer(invocation -> invocation.getArgument(0));
@@ -342,6 +346,33 @@ public class AuthSessionTest {
testInvokesCancel(session -> session.onDialogDismissed(DISMISSED_REASON_NEGATIVE, null));
}
@Test
public void testCallbackOnAcquired() throws RemoteException {
final String acquiredStr = "test_acquired_info_callback";
final String acquiredStrVendor = "test_acquired_info_callback_vendor";
setupFingerprint(0 /* id */, FingerprintSensorProperties.TYPE_REAR);
final AuthSession session = createAuthSession(mSensors,
false /* checkDevicePolicyManager */,
Authenticators.BIOMETRIC_STRONG,
TEST_REQUEST_ID,
0 /* operationId */,
0 /* userId */);
when(mContext.getString(com.android.internal.R.string.fingerprint_acquired_partial))
.thenReturn(acquiredStr);
session.onAcquired(0, FingerprintManager.FINGERPRINT_ACQUIRED_PARTIAL, 0);
verify(mStatusBarService).onBiometricHelp(anyInt(), eq(acquiredStr));
verify(mClientReceiver).onAcquired(eq(1), eq(acquiredStr));
when(mResources.getStringArray(com.android.internal.R.array.fingerprint_acquired_vendor))
.thenReturn(new String[]{acquiredStrVendor});
session.onAcquired(0, FingerprintManager.FINGERPRINT_ACQUIRED_VENDOR, 0);
verify(mStatusBarService).onBiometricHelp(anyInt(), eq(acquiredStrVendor));
verify(mClientReceiver).onAcquired(
eq(FingerprintManager.FINGERPRINT_ACQUIRED_VENDOR_BASE), eq(acquiredStrVendor));
}
// TODO (b/208484275) : Enable these tests
// @Test
// public void testPreAuth_canAuthAndPrivacyDisabled() throws Exception {