Run postEnroll() after enrolling from SUW

Bug: 131231334
Test: tested on blueline
Change-Id: I225725edb1c3379f2f3f5bc8b5cbe9adddb49f59
This commit is contained in:
Ilya Matyukhin
2019-04-28 00:29:32 -07:00
parent d464f67e31
commit cee87535e2

View File

@@ -33,6 +33,7 @@ import com.android.settings.biometrics.BiometricEnrollBase;
import com.google.android.setupcompat.template.FooterBarMixin; import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.util.WizardManagerHelper;
/** /**
* Activity which concludes fingerprint enrollment. * Activity which concludes fingerprint enrollment.
@@ -104,6 +105,9 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
protected void onNextButtonClick(View view) { protected void onNextButtonClick(View view) {
updateFingerprintSuggestionEnableState(); updateFingerprintSuggestionEnableState();
setResult(RESULT_FINISHED); setResult(RESULT_FINISHED);
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
postEnroll();
}
finish(); 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) { private void onAddAnotherButtonClick(View view) {
startActivityForResult(getFingerprintEnrollingIntent(), REQUEST_ADD_ANOTHER); startActivityForResult(getFingerprintEnrollingIntent(), REQUEST_ADD_ANOTHER);
} }