commit cee87535e23887f85099ab4678f9328948aab87b
author Ilya Matyukhin <ilyamaty@google.com> Sun Apr 28 00:29:32 2019 -0700
committer Ilya Matyukhin <ilyamaty@google.com> Sun Apr 28 16:24:29 2019 -0700
tree 7c069b196f9d6aa471eeee6a2e44f96c465c3f71
parent d464f67e31d0b50829030ff9f32973c58f07abc3

Run postEnroll() after enrolling from SUW

Bug: 131231334
Test: tested on blueline
Change-Id: I225725edb1c3379f2f3f5bc8b5cbe9adddb49f59

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index b8ec103..5984d62 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.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 @@
     protected void onNextButtonClick(View view) {
         updateFingerprintSuggestionEnableState();
         setResult(RESULT_FINISHED);
+        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
+            postEnroll();
+        }
         finish();
     }
 
@@ -127,6 +131,16 @@
         }
     }
 
+    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);
     }