Merge "Reset mCurrentUserId when fingerprintd died" am: b60951f670 am: 674922574a

am: ab726b4579

Change-Id: Ib3230340918d5d22a44149cacb006b0ad59dcc56

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

@@ -195,6 +195,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);
     }