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

Revert "Temporarily remove support for biometrics.face@1.1"

Browse Source 
This reverts commit ec297f3eb2.

Reason for revert: reverting a temporary revert

Change-Id: Ie48bf3f8983b008f9eff9e0ce8fe283dded775ce
This commit is contained in:
Ilya Matyukhin
2020-03-27 21:53:17 +00:00
parent 47d33eccf7
commit cccbd64ff7
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/Android.bp
View File

@@ -118,7 +118,7 @@ java_library_static {
"android.hardware.health-V2.1-java",
"android.hardware.light-java",
"android.hardware.weaver-V1.0-java",
"android.hardware.biometrics.face-V1.0-java",
"android.hardware.biometrics.face-V1.1-java",
"android.hardware.biometrics.fingerprint-V2.2-java",
"android.hardware.oemlock-V1.0-java",
"android.hardware.configstore-V1.0-java",

13
services/core/java/com/android/server/biometrics/face/FaceService.java
View File

@@ -1043,7 +1043,18 @@ public class FaceService extends BiometricServiceBase {
for (int i = 0; i < cryptoToken.length; i++) {
token.add(cryptoToken[i]);
}
return daemon.enroll(token, timeout, disabledFeatures);
android.hardware.biometrics.face.V1_1.IBiometricsFace daemon11 =
android.hardware.biometrics.face.V1_1.IBiometricsFace.castFrom(
daemon);
if (daemon11 != null) {
return daemon11.enroll_1_1(token, timeout, disabledFeatures,
convertSurfaceToNativeHandle(surface));
} else if (surface == null) {
return daemon.enroll(token, timeout, disabledFeatures);
} else {
Slog.e(TAG, "enroll(): surface is only supported in @1.1 HAL");
return ERROR_ESRCH;
}
}
@Override