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

Commit 5d6ed312 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Adding biometric FRR Notification atom." into main

parents 1eaffc3f e5f62676

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.hardware.biometrics.BiometricManager;

import android.hardware.biometrics.SensorProperties;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceSensorPropertiesInternal;
@@ -65,6 +66,7 @@ import java.lang.annotation.RetentionPolicy; 
 */

public class BiometricUtils {

    private static final String TAG = "BiometricUtils";

    public static final String EXTRA_ENROLL_REASON = BiometricManager.EXTRA_ENROLL_REASON;



    /** The character ' • ' to separate the setup choose options */

    public static final String SEPARATOR = " \u2022 ";

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

+2 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
        }



        intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());

        intent.putExtra(BiometricUtils.EXTRA_ENROLL_REASON,

                getIntent().getIntExtra(BiometricUtils.EXTRA_ENROLL_REASON, -1));



        if (!mSwitchDiversity.isChecked() && mAccessibilityEnabled) {

            FaceEnrollAccessibilityDialog dialog = FaceEnrollAccessibilityDialog.newInstance();

src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { 
            disabledFeatures[i] = mDisabledFeatures.get(i);

        }



        return new FaceEnrollSidecar(disabledFeatures);

        return new FaceEnrollSidecar(disabledFeatures, getIntent());

    }



    @Override

src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java

+3 −0
Original line number Diff line number Diff line
@@ -484,6 +484,9 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
    protected Intent getEnrollingIntent() {

        Intent intent = new Intent(this, FaceEnrollEducation.class);

        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);

        intent.putExtra(BiometricUtils.EXTRA_ENROLL_REASON,

                getIntent().getIntExtra(BiometricUtils.EXTRA_ENROLL_REASON, -1));



        return intent;

    }

src/com/android/settings/biometrics/face/FaceEnrollSidecar.java

+6 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.biometrics.face; 


import android.app.Activity;

import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.hardware.face.FaceManager;



import com.android.settings.biometrics.BiometricEnrollSidecar;
@@ -33,8 +34,11 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar { 


    private FaceUpdater mFaceUpdater;



    public FaceEnrollSidecar(int[] disabledFeatures) {

    private Intent mIntent;



    public FaceEnrollSidecar(int[] disabledFeatures, Intent intent) {

        mDisabledFeatures = Arrays.copyOf(disabledFeatures, disabledFeatures.length);

        mIntent = intent;

    }



    @Override
@@ -47,7 +51,7 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar { 
    public void startEnrollment() {

        super.startEnrollment();

        mFaceUpdater.enroll(mUserId, mToken, mEnrollmentCancel,

                mEnrollmentCallback, mDisabledFeatures);

                mEnrollmentCallback, mDisabledFeatures, mIntent);

    }



    private FaceManager.EnrollmentCallback mEnrollmentCallback