From cee87535e23887f85099ab4678f9328948aab87b Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Sun, 28 Apr 2019 00:29:32 -0700 Subject: [PATCH] Run postEnroll() after enrolling from SUW Bug: 131231334 Test: tested on blueline Change-Id: I225725edb1c3379f2f3f5bc8b5cbe9adddb49f59 --- .../fingerprint/FingerprintEnrollFinish.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index b8ec103b015..5984d624203 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -33,6 +33,7 @@ import com.android.settings.biometrics.BiometricEnrollBase; import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterButton; +import com.google.android.setupcompat.util.WizardManagerHelper; /** * Activity which concludes fingerprint enrollment. @@ -104,6 +105,9 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { protected void onNextButtonClick(View view) { updateFingerprintSuggestionEnableState(); setResult(RESULT_FINISHED); + if (WizardManagerHelper.isAnySetupWizard(getIntent())) { + postEnroll(); + } finish(); } @@ -127,6 +131,16 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { } } + private void postEnroll() { + final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this); + if (fpm != null) { + int result = fpm.postEnroll(); + if (result < 0) { + Log.w(TAG, "postEnroll failed: result = " + result); + } + } + } + private void onAddAnotherButtonClick(View view) { startActivityForResult(getFingerprintEnrollingIntent(), REQUEST_ADD_ANOTHER); }