Merge "Properly remove fingerprints when removing device lock." into oc-dev am: 98229bdf32 (80c3a16e) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

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

+7 −6

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