Merge "Ensure setActiveGroup() does the right thing after a HAL crash."

2019-02-08 20:01:07 +00:00
parent b9f1cae5f8 7b78b22ac1
commit 625e4b6e2b
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -705,6 +705,8 @@ public class FaceService extends BiometricServiceBase {
    public void serviceDied(long cookie) {
        super.serviceDied(cookie);
        mDaemon = null;
+
+        mCurrentUserId = UserHandle.USER_NULL; // Force updateActiveGroup() to re-evaluate
    }

    @Override