Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59834e6b authored by Kevin Chyn's avatar Kevin Chyn
Browse files

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
parent 613dcd9d

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

+5 −13
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import com.google.android.setupcompat.util.WizardManagerHelper; 
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 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
        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 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
        }



        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 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
                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();

        }

    }