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

Browse Source 
am: 98229bdf32

Change-Id: I98ed8a43e4644d709d9cb9ddeb799672a8fb6bc6
This commit is contained in:
Charles He
2017-05-17 13:04:40 +00:00
committed by android-build-merger
parent f8b8ecebea 98229bdf32
commit af36129ae9
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/ChooseLockGeneric.java
View File

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

2
src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
View File

@@ -53,7 +53,7 @@ public class FingerprintRemoveSidecar extends InstrumentedPreferenceFragment {
private FingerprintManager.RemovalCallback private FingerprintManager.RemovalCallback
mRemoveCallback = new FingerprintManager.RemovalCallback() { mRemoveCallback = new FingerprintManager.RemovalCallback() {
@Override @Override
public void onRemovalSucceeded(Fingerprint fingerprint) { public void onRemovalSucceeded(Fingerprint fingerprint, int remaining) {
if (mListener != null) { if (mListener != null) {
mListener.onRemovalSucceeded(fingerprint); mListener.onRemovalSucceeded(fingerprint);
} else { } else {