commit 59834e6bf4490320a5fc4959520e5e60cb054be6
author Kevin Chyn <kchyn@google.com> Tue Mar 10 17:26:26 2020 -0700
committer Kevin Chyn <kchyn@google.com> Tue Mar 10 17:26:26 2020 -0700
tree 9cc133a98cb5e0b2acccfd310baa023c8c83ffcb
parent 613dcd9dfe6c10f64d766f1fa76e8a582b8986b9

Partial revert of ag/10482633

SUW is using activity result codes already. Let's stick with the old
behavior until/if there's a way to make it work nicely.

Fixes: 151058692

Test: Skip fingerprint in SUW. Fingerprint not shown again in SUW.
Change-Id: I3c52cddd568dc5ded6bf810272ffb77f0841c692

src/com/android/settings/biometrics/BiometricEnrollActivity.java

diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index fa01977..a0aa6db 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -47,7 +47,6 @@
 public class BiometricEnrollActivity extends InstrumentedActivity {
 
     private static final String TAG = "BiometricEnrollActivity";
-    private static final int REQUEST_ENROLL = 1;
 
     public static final String EXTRA_SKIP_INTRO = "skip_intro";
 
@@ -72,7 +71,6 @@
         if (result == BiometricManager.BIOMETRIC_SUCCESS
                 || result == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
             Log.e(TAG, "Unexpected result: " + result);
-            setResult(RESULT_CANCELED);
             finish();
             return;
         }
@@ -96,6 +94,8 @@
         }
 
         if (intent != null) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+
             if (this instanceof InternalActivity) {
                 // Propagate challenge and user Id from ChooseLockGeneric.
                 final byte[] token = getIntent()
@@ -107,18 +107,10 @@
                 intent.putExtra(Intent.EXTRA_USER_ID, userId);
             }
 
-            startActivityForResult(intent, REQUEST_ENROLL);
-        } else {
-            Log.e(TAG, "Intent was null, finishing with RESULT_CANCELED");
-            setResult(RESULT_CANCELED);
+            startActivity(intent);
             finish();
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_ENROLL) {
-            setResult(RESULT_OK);
+        } else {
+            Log.e(TAG, "Intent was null, finishing");
             finish();
         }
     }