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

Merge "Properly remove fingerprints when removing device lock." into oc-dev am: 98229bdf32

Browse Source 
am: af36129ae9

Change-Id: Iffc4f16ac3301bc0fbe9b4d8a1c88b3e71ce2373
This commit is contained in:
Charles He
2017-05-17 13:12:00 +00:00
committed by android-build-merger
parent 2d6c7df80b af36129ae9
commit 80c3a16e92
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -704,15 +704,16 @@ public class ChooseLockGeneric extends SettingsActivity {
@Override
public void onRemovalError(Fingerprint fp, int errMsgId,
CharSequence errString) {
Log.v(TAG, "Fingerprint removed: " + fp.getFingerId());
if (fp.getFingerId() == 0) {
removeManagedProfileFingerprintsAndFinishIfNecessary(userId);
}
Log.e(TAG, String.format(
"Can't remove fingerprint %d in group %d. Reason: %s",
fp.getFingerId(), fp.getGroupId(), errString));
// TODO: need to proceed with the removal of managed profile
// fingerprints and finish() gracefully.
}
@Override
public void onRemovalSucceeded(Fingerprint fingerprint) {
if (fingerprint.getFingerId() == 0) {
public void onRemovalSucceeded(Fingerprint fp, int remaining) {
if (remaining == 0) {
removeManagedProfileFingerprintsAndFinishIfNecessary(userId);
}
}