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

am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev

Browse Source 
* commit 'f7fc6429874fd02bc3670bce98b2158d2a78aecd':
  Don't attempt to remove fp templates if none are enrolled
This commit is contained in:
Jim Miller
2015-08-25 23:18:54 +00:00
committed by Android Git Automerger
parent 6e58d516f0 f7fc642987
commit d7e4cd9b1e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,7 +505,8 @@ public class ChooseLockGeneric extends SettingsActivity {
} }
private void removeAllFingerprintTemplatesAndFinish() { private void removeAllFingerprintTemplatesAndFinish() {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) { if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.getEnrolledFingerprints().size() > 0) {
mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback); mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
} else { } else {
finish(); finish();