From 895da77aa6baa9231faa2a1159b673b6c67db3b9 Mon Sep 17 00:00:00 2001
From: "takuya,souma" <takuya.x.souma@sonymobile.com>
Date: Tue, 13 Sep 2016 16:58:08 +0900
Subject: [PATCH] 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: I0d3452fc6c1f82bb2a2af10f61d3f3a47df9dec6
---
 .../java/com/android/server/fingerprint/FingerprintService.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index cc556c7e45b34..a12a92cc7a6ae 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -178,6 +178,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
     public void binderDied() {
         Slog.v(TAG, "fingerprintd died");
         mDaemon = null;
+        mCurrentUserId = UserHandle.USER_CURRENT;
         handleError(mHalDeviceId, FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE);
     }