commit e7863c231be354202c95e77295e583df01ebb8fd
author Jim Miller <jaggies@google.com> Wed Sep 28 20:33:06 2016 -0700
committer gitbuildkicker <android-build@google.com> Fri Sep 30 13:14:31 2016 -0700
tree c9b9832acc0bc7fb7b783b7f3a587a0d85c3a4aa
parent e848dee93995d87feb4f5473657435bb6332c13c

Reset mCurrentUserId when fingerprintd died

A template fingerprint data is not loaded in fingerprintd when
fingerprintd is died and restarted.
FigerprintService tries to set userId after a restart of fingerprintd,
but it's skipped because the service tries to set same userId already
set to mCurrentUserId.

To load correct template fingerprint data, reset mCurrentUserId
when fingerprintd died.

Bug: 31734514
Change-Id: I6b8d4b5b685765fe33ef8e654593b615240748a8
(cherry picked from commit be11bc5f0a95e00a63018aa758d86eb253bab3b2)

services/core/java/com/android/server/fingerprint/FingerprintService.java

diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 73c8469..9e132f7 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -195,6 +195,7 @@
     public void binderDied() {
         Slog.v(TAG, "fingerprintd died");
         mDaemon = null;
+        mCurrentUserId = UserHandle.USER_CURRENT;
         handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
     }