commit 576811e3b58edb3794f16b99cc7b2331451f935e
author Kevin Chyn <kchyn@google.com> Wed Jun 12 14:50:35 2019 -0700
committer Kevin Chyn <kchyn@google.com> Wed Jun 12 15:00:47 2019 -0700
tree 859f69fb081c7259c51d797c240827a1b289edd2
parent 01462c0b9528db64017205d736b9495b55758cbd

Decrease amount of getAuthenticatorId invocations to the HAL

The HIDL contract is to update the authenticatorID when a new template
is enrolled. Thus, only update the authenticatorId cache when

1) the user is actually switching, which is infrequent
2) a user has enrolled a new biometric

Fixes: 133578311

Test: Authenticator ID is updated when new enrollment occurs
Change-Id: If79cb43ac1f42676995c955203653cb5fae0f10f

services/core/java/com/android/server/biometrics/face/FaceService.java

diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index 0f2b16a..d172fbc 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -707,6 +707,18 @@
                 final Face face = new Face(getBiometricUtils()
                         .getUniqueName(getContext(), userId), faceId, deviceId);
                 FaceService.super.handleEnrollResult(face, remaining);
+
+                // Enrollment changes the authenticatorId, so update it here.
+                IBiometricsFace daemon = getFaceDaemon();
+                if (remaining == 0 && daemon != null) {
+                    try {
+                        mAuthenticatorIds.put(userId,
+                                hasEnrolledBiometrics(userId) ? daemon.getAuthenticatorId().value
+                                        : 0L);
+                    } catch (RemoteException e) {
+                        Slog.e(TAG, "Unable to get authenticatorId", e);
+                    }
+                }
             });
         }
 
@@ -968,9 +980,9 @@
 
                     daemon.setActiveUser(userId, faceDir.getAbsolutePath());
                     mCurrentUserId = userId;
+                    mAuthenticatorIds.put(userId,
+                            hasEnrolledBiometrics(userId) ? daemon.getAuthenticatorId().value : 0L);
                 }
-                mAuthenticatorIds.put(userId,
-                        hasEnrolledBiometrics(userId) ? daemon.getAuthenticatorId().value : 0L);
             } catch (RemoteException e) {
                 Slog.e(TAG, "Failed to setActiveUser():", e);
             }