From 967a9a12a73b7c4b00badfecf4721dfa75e0abcf Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 9 May 2016 18:31:22 -0700
Subject: [PATCH] Always update cached copy of authenticatorId.

This fixes a bug where the cached copy of authenticatorId
was incorrect immediately after enrolling a new fingerprint.
During enroll, the authenticatorId is changed and needs to be updated.
The fix is to always get the new authenticatorId when we
call setActiveGroup(), which happens during every new

Fixes bug 28606914

Change-Id: I8b2d3afe67b3677b6e4516a550d874d9c2e426cd
---
 .../java/com/android/server/fingerprint/FingerprintService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index ae01635c0905f..142426dd4fd91 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -968,8 +968,8 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                     }
                     daemon.setActiveGroup(userId, fpDir.getAbsolutePath().getBytes());
                     mCurrentUserId = userId;
-                    mCurrentAuthenticatorId = daemon.getAuthenticatorId();
                 }
+                mCurrentAuthenticatorId = daemon.getAuthenticatorId();
             } catch (RemoteException e) {
                 Slog.e(TAG, "Failed to setActiveGroup():", e);
             }