PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 25c0b7b

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

Change-Id: I1c7df2c60f898807a3e64fa714db4ff4675835fc
This commit is contained in:
Jim Miller
2016-04-20 21:42:23 +00:00
committed by android-build-merger
parent f21a205ff3 25c0b7bc4e
commit a2d94e9973
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -651,8 +651,10 @@ public class ChooseLockGeneric extends SettingsActivity {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected() if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.hasEnrolledFingerprints(userId)) { && mFingerprintManager.hasEnrolledFingerprints(userId)) {
mFingerprintManager.setActiveUser(userId); mFingerprintManager.setActiveUser(userId);
mFingerprintManager.remove( // For the purposes of M and N, groupId is the same as userId.
new Fingerprint(null, userId, 0, 0), userId, final int groupId = userId;
Fingerprint finger = new Fingerprint(null, groupId, 0, 0);
mFingerprintManager.remove(finger, userId,
new RemovalCallback() { new RemovalCallback() {
@Override @Override
public void onRemovalError(Fingerprint fp, int errMsgId, public void onRemovalError(Fingerprint fp, int errMsgId,