From 66cbc53de0df6b44e049c49464e83a2fa81e8f64 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 26 Jan 2021 19:10:22 -0800
Subject: [PATCH] Remove unnecessary getAuthenticatorId

The framework already caches the authenticatorId upon user
switches and new enrollments. So, if the requested user is already
the current user, there should be no need to request the HAL for
the authenticatorId.

Bug: 178018968
Test: manual
Change-Id: I6965605b16a4334324c53ed110ca92c2cec46bad
---
 .../hidl/FingerprintUpdateActiveUserClient.java           | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java
index 11ffbb27128ac..db7f4bcbec9d6 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintUpdateActiveUserClient.java
@@ -62,13 +62,7 @@ public class FingerprintUpdateActiveUserClient extends HalClientMonitor<IBiometr
         super.start(callback);
 
         if (mCurrentUserId == getTargetUserId()) {
-            Slog.d(TAG, "Already user: " + mCurrentUserId + ", refreshing authenticatorId");
-            try {
-                mAuthenticatorIds.put(getTargetUserId(), mHasEnrolledBiometrics
-                        ? getFreshDaemon().getAuthenticatorId() : 0L);
-            } catch (RemoteException e) {
-                Slog.e(TAG, "Unable to refresh authenticatorId", e);
-            }
+            Slog.d(TAG, "Already user: " + mCurrentUserId + ", returning");
             callback.onClientFinished(this, true /* success */);
             return;
         }