Biometric HAL death should invoke handleError on the handler

All client lifecycle is modified on the handler. When the HAL dies,
serviceDied comes in on the main thread and will race with the rest of
client lifecycle manipulation. We need to guarantee this is in order,
otherwise it's possible for BiometricService to receive the following
order of events
1) BiometricService requests auth
2) Face/FingerprintService is ready to start auth
3) HAL dies in the middle of 2), and sends onError to BiometricService
4) onReadyForAuthentication is sent to BiometricService, causing NPE

With this change, it will guarantee that 3) occurs after 4), which will
avoid A) BiometricService receiving events out of order, and more
importantly B) allow BiometricPrompt to show the HW_UNAVAILABLE error
instead of crashing system server.

Fixes: 137800315

Test: Authentication with BiometricPromptDemo while killing the HAL
Change-Id: Iae2d5b39dd494123f274b47edcc44c3afc1fff8c
This commit is contained in:
Kevin Chyn
2019-07-18 13:37:23 -07:00
parent 53496f6fb3
commit 2e312791d6

View File

@@ -665,8 +665,12 @@ public abstract class BiometricServiceBase extends SystemService
mMetricsLogger.count(getConstants().tagHalDied(), 1);
mHALDeathCount++;
mCurrentUserId = UserHandle.USER_NULL;
handleError(getHalDeviceId(), BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE,
0 /*vendorCode */);
// All client lifecycle must be managed on the handler.
mHandler.post(() -> {
handleError(getHalDeviceId(), BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE,
0 /*vendorCode */);
});
StatsLog.write(StatsLog.BIOMETRIC_SYSTEM_HEALTH_ISSUE_DETECTED, statsModality(),
BiometricsProtoEnums.ISSUE_HAL_DEATH);