commit 25c0b7bc4e12d6f0774695ca504118abba81ea88
author Jim Miller <jaggies@google.com> Wed Apr 20 21:33:13 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 20 21:33:13 2016 +0000
tree cb697c27458d40ec0cec7e9d4718d4e7b8100354
parent e0892e16adb55e3f0b368b9d461efae09bf38c5b
parent 5a8e522c6c3d71164f9d84ef98461de5dff4ccef

Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 1182ed5..74ec4bb 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -651,8 +651,10 @@
             if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
                     && mFingerprintManager.hasEnrolledFingerprints(userId)) {
                 mFingerprintManager.setActiveUser(userId);
-                mFingerprintManager.remove(
-                        new Fingerprint(null, userId, 0, 0), userId,
+                // For the purposes of M and N, groupId is the same as userId.
+                final int groupId = userId;
+                Fingerprint finger = new Fingerprint(null, groupId, 0, 0);
+                mFingerprintManager.remove(finger, userId,
                         new RemovalCallback() {
                             @Override
                             public void onRemovalError(Fingerprint fp, int errMsgId,