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

Commit cdb654f9 authored by Joshua McCloskey's avatar Joshua McCloskey
Browse files

Fixed unicorn multi-enrollment flow. 

Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
parent dc72a4a1

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

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        super.onActivityResult(requestCode, resultCode, data);



        Log.d(TAG,

                "onActivityResult(requestCode=" + requestCode + ", resultCode=" + resultCode + ")");

        // single enrollment is handled entirely by the launched activity

        // this handles multi enroll or if parental consent is required

        if (mParentalConsentHelper != null) {

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

+2 −1
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 
    @Override

    protected void onStop() {

        super.onStop();

        if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()) {

        if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()

                && !BiometricUtils.isAnyMultiBiometricFlow(this)) {

            setResult(RESULT_TIMEOUT);

            finish();

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.hardware.biometrics.BiometricAuthenticator; 
import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;

import android.view.View;

import android.widget.TextView;
@@ -302,7 +303,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 


    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        // TODO(b/229924331): Add tests for the enrollment flows.

        Log.d(TAG,

                "onActivityResult(requestCode=" + requestCode + ", resultCode=" + resultCode + ")");

        final boolean cameFromMultiBioFpAuthAddAnother =

                requestCode == BiometricUtils.REQUEST_ADD_ANOTHER

                && BiometricUtils.isMultiBiometricFingerprintEnrollmentFlow(this);

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

+12 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ public class BiometricUtils { 
        return activity.getIntent().hasExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);

    }





    /**

     * Used for checking if a multi-biometric enrollment flowstarts with Fingerprint

     * and ends with Face.
@@ -254,6 +253,18 @@ public class BiometricUtils { 
                MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FINGERPRINT);

    }



    /**

     * Used to check if the activity is a multi biometric flow activity.

     *

     * @param activity Activity to check

     * @return True if the activity is going through a multi-biometric enrollment flow, that starts

     * with Fingerprint.

     */

    public static boolean isAnyMultiBiometricFlow(@NonNull Activity activity) {

        return isMultiBiometricFaceEnrollmentFlow(activity)

                || isMultiBiometricFingerprintEnrollmentFlow(activity);

    }



    public static void copyMultiBiometricExtras(@NonNull Intent fromIntent,

            @NonNull Intent toIntent) {

        PendingIntent pendingIntent = (PendingIntent) fromIntent.getExtra(

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

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase 
                getSupportFragmentManager()

                        .beginTransaction().remove(mSidecar).commitAllowingStateLoss();

            }

            if (!WizardManagerHelper.isAnySetupWizard(getIntent())) {

            if (!WizardManagerHelper.isAnySetupWizard(getIntent())

                    && !BiometricUtils.isAnyMultiBiometricFlow(this)) {

                setResult(RESULT_TIMEOUT);

            }

            finish();