commit 5a8e522c6c3d71164f9d84ef98461de5dff4ccef
author Jim Miller <jaggies@google.com> Wed Apr 20 14:06:00 2016 -0700
committer Jim Miller <jaggies@google.com> Wed Apr 20 14:06:00 2016 -0700
tree 7a1379f6000884ff80ae6d5c1f5c18143e045ad1
parent c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd

Fix bug where fingerprint for wrong userId was attempted to be removed.

- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: Ic8abfbf6fbf173db2d57a76ac2e38b2a71ffd19e

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,