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

Commit 3e385425 authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

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

am: 25c0b7bc

* commit '25c0b7bc':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I62d0d25643df925e45e895ad40e2f3ad289a8812
parents be218128 25c0b7bc

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,