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

Cleaned up side fps logic

Browse Source 
Test: atest FingerprintAuthenticationClientTest
Test: manual.
Fixes: 252888293
Change-Id: I6a872757ecb6294b55536bea75919bb53db52603
Merged-In: I6a872757ecb6294b55536bea75919bb53db52603
This commit is contained in:
Joshua McCloskey
2022-10-11 17:57:30 +00:00
committed by Joshua Mccloskey
parent 9a0ed1afe1
commit 20987e7f2b
3 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/values/config.xml
View File

@@ -3553,9 +3553,9 @@
config_sidefpsSkipWaitForPowerVendorAcquireMessage --> config_sidefpsSkipWaitForPowerVendorAcquireMessage -->
<integer name="config_sidefpsSkipWaitForPowerAcquireMessage">6</integer> <integer name="config_sidefpsSkipWaitForPowerAcquireMessage">6</integer>
<!-- This vendor acquired message that will cause the sidefpsKgPowerPress window to be skipped. <!-- This vendor acquired message will cause the sidefpsKgPowerPress window to be skipped
config_sidefpsSkipWaitForPowerOnFingerUp must be true and when config_sidefpsSkipWaitForPowerAcquireMessage == 6 (VENDOR) and the vendor acquire
config_sidefpsSkipWaitForPowerAcquireMessage must be BIOMETRIC_ACQUIRED_VENDOR == 6. --> message equals this constant -->
<integer name="config_sidefpsSkipWaitForPowerVendorAcquireMessage">2</integer> <integer name="config_sidefpsSkipWaitForPowerVendorAcquireMessage">2</integer>
<!-- This config is used to force VoiceInteractionService to start on certain low ram devices. <!-- This config is used to force VoiceInteractionService to start on certain low ram devices.

3
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
View File

@@ -265,8 +265,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<AidlSession>
final boolean acquireMessageMatch = acquiredInfo == mSkipWaitForPowerAcquireMessage; final boolean acquireMessageMatch = acquiredInfo == mSkipWaitForPowerAcquireMessage;
final boolean vendorMessageMatch = vendorCode == mSkipWaitForPowerVendorAcquireMessage; final boolean vendorMessageMatch = vendorCode == mSkipWaitForPowerVendorAcquireMessage;
final boolean ignorePowerPress = final boolean ignorePowerPress =
(acquireMessageMatch && !shouldLookForVendor) || (shouldLookForVendor acquireMessageMatch && (!shouldLookForVendor || vendorMessageMatch);
&& acquireMessageMatch && vendorMessageMatch);
if (ignorePowerPress) { if (ignorePowerPress) {
Slog.d(TAG, "(sideFPS) onFingerUp"); Slog.d(TAG, "(sideFPS) onFingerUp");

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

@@ -40,6 +40,7 @@ import android.hardware.biometrics.common.OperationContext;
import android.hardware.biometrics.fingerprint.ISession; import android.hardware.biometrics.fingerprint.ISession;
import android.hardware.biometrics.fingerprint.PointerContext; import android.hardware.biometrics.fingerprint.PointerContext;
import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.hardware.fingerprint.ISidefpsController; import android.hardware.fingerprint.ISidefpsController;
import android.hardware.fingerprint.IUdfpsOverlayController; import android.hardware.fingerprint.IUdfpsOverlayController;
@@ -422,6 +423,52 @@ public class FingerprintAuthenticationClientTest {
verify(mCallback).onClientFinished(any(), eq(true)); verify(mCallback).onClientFinished(any(), eq(true));
} }
@Test
public void sideFingerprintSkipsWindowIfVendorMessageMatch() throws Exception {
when(mSensorProps.isAnySidefpsType()).thenReturn(true);
final int vendorAcquireMessage = 1234;
mContext.getOrCreateTestableResources().addOverride(
R.integer.config_sidefpsSkipWaitForPowerAcquireMessage,
FingerprintManager.FINGERPRINT_ACQUIRED_VENDOR);
mContext.getOrCreateTestableResources().addOverride(
R.integer.config_sidefpsSkipWaitForPowerVendorAcquireMessage,
vendorAcquireMessage);
final FingerprintAuthenticationClient client = createClient(1);
client.start(mCallback);
mLooper.dispatchAll();
client.onAuthenticated(new Fingerprint("friendly", 4 /* fingerId */, 5 /* deviceId */),
true /* authenticated */, new ArrayList<>());
client.onAcquired(FingerprintManager.FINGERPRINT_ACQUIRED_VENDOR, vendorAcquireMessage);
mLooper.dispatchAll();
verify(mCallback).onClientFinished(any(), eq(true));
}
@Test
public void sideFingerprintDoesNotSkipWindowOnVendorErrorMismatch() throws Exception {
when(mSensorProps.isAnySidefpsType()).thenReturn(true);
final int vendorAcquireMessage = 1234;
mContext.getOrCreateTestableResources().addOverride(
R.integer.config_sidefpsSkipWaitForPowerAcquireMessage,
FingerprintManager.FINGERPRINT_ACQUIRED_VENDOR);
mContext.getOrCreateTestableResources().addOverride(
R.integer.config_sidefpsSkipWaitForPowerVendorAcquireMessage,
vendorAcquireMessage);
final FingerprintAuthenticationClient client = createClient(1);
client.start(mCallback);
mLooper.dispatchAll();
client.onAuthenticated(new Fingerprint("friendly", 4 /* fingerId */, 5 /* deviceId */),
true /* authenticated */, new ArrayList<>());
client.onAcquired(FingerprintManager.FINGERPRINT_ACQUIRED_VENDOR, 1);
mLooper.dispatchAll();
verify(mCallback, never()).onClientFinished(any(), anyBoolean());
}
@Test @Test
public void sideFingerprintSendsAuthIfFingerUp() throws Exception { public void sideFingerprintSendsAuthIfFingerUp() throws Exception {
when(mSensorProps.isAnySidefpsType()).thenReturn(true); when(mSensorProps.isAnySidefpsType()).thenReturn(true);