Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98229bdf authored May 17, 2017 by Charles He Committed by Android (Google) Code Review May 17, 2017

Merge "Properly remove fingerprints when removing device lock." into oc-dev

parents bcb2565e 7569bb18

src/com/android/settings/ChooseLockGeneric.java

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}

src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 {