Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c0b7bc authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents e0892e16 5a8e522c

src/com/android/settings/ChooseLockGeneric.java

+4 −2
Original line number Diff line number Diff line
@@ -651,8 +651,10 @@ public class ChooseLockGeneric extends SettingsActivity { 
            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,