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 am: 25c0b7b am: a2d94e9

Browse Source 
am: eb362d24a6

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

Change-Id: I425f9473b8b361cb4734f575df1b66592ee70c17
This commit is contained in:
Jim Miller
2016-04-21 03:29:04 +00:00
committed by android-build-merger
parent d89cf62424 eb362d24a6
commit d6bcbabc32
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()
&& 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,