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

Commit cf43d1a2 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes I599dbcd3,I7f3b023a 

* changes:
  7/n: Fix templating for biometric utils
  6/n: Add RemovalClient for IFingerprint
parents 7095b117 ac6fe81d

services/core/java/com/android/server/biometrics/sensors/face/FaceUserState.java

+4 −15
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.biometrics.sensors.face;



import android.content.Context;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.face.Face;

import android.util.AtomicFile;

import android.util.Slog;
@@ -41,7 +40,7 @@ import java.util.ArrayList; 
 * Class managing the set of faces per user across device reboots.

 * @hide

 */

public class FaceUserState extends BiometricUserState {

public class FaceUserState extends BiometricUserState<Face> {



    private static final String TAG = "FaceState";

    private static final String FACE_FILE = "settings_face.xml";
@@ -72,19 +71,9 @@ public class FaceUserState extends BiometricUserState { 
    }



    @Override

    public void addBiometric(BiometricAuthenticator.Identifier identifier) {

        if (identifier instanceof Face) {

            super.addBiometric(identifier);

        } else {

            Slog.w(TAG, "Attempted to add non-face identifier");

        }

    }



    @Override

    protected ArrayList getCopy(ArrayList array) {

        ArrayList<Face> result = new ArrayList<>(array.size());

        for (int i = 0; i < array.size(); i++) {

            Face f = (Face) array.get(i);

    protected ArrayList<Face> getCopy(ArrayList<Face> array) {

        final ArrayList<Face> result = new ArrayList<>();

        for (Face f : array) {

            result.add(new Face(f.getName(), f.getBiometricId(), f.getDeviceId()));

        }

        return result;

services/core/java/com/android/server/biometrics/sensors/face/FaceUtils.java

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.util.List; 
/**

 * Utility class for dealing with faces and face settings.

 */

public class FaceUtils implements BiometricUtils {

public class FaceUtils implements BiometricUtils<Face> {



    private static final Object sInstanceLock = new Object();

    private static FaceUtils sInstance;
@@ -56,9 +56,8 @@ public class FaceUtils implements BiometricUtils { 
    }



    @Override

    public void addBiometricForUser(Context ctx, int userId,

            BiometricAuthenticator.Identifier identifier) {

        getStateForUser(ctx, userId).addBiometric(identifier);

    public void addBiometricForUser(Context ctx, int userId, Face face) {

        getStateForUser(ctx, userId).addBiometric(face);

    }



    @Override

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUserState.java

+4 −15
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.biometrics.sensors.fingerprint;



import android.content.Context;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.fingerprint.Fingerprint;

import android.util.AtomicFile;

import android.util.Slog;
@@ -40,7 +39,7 @@ import java.util.ArrayList; 
 * Class managing the set of fingerprint per user across device reboots.

 * @hide

 */

public class FingerprintUserState extends BiometricUserState {

public class FingerprintUserState extends BiometricUserState<Fingerprint> {



    private static final String TAG = "FingerprintState";

    private static final String FINGERPRINT_FILE = "settings_fingerprint.xml";
@@ -72,19 +71,9 @@ public class FingerprintUserState extends BiometricUserState { 
    }



    @Override

    public void addBiometric(BiometricAuthenticator.Identifier identifier) {

        if (identifier instanceof Fingerprint) {

            super.addBiometric(identifier);

        } else {

            Slog.w(TAG, "Attempted to add non-fingerprint identifier");

        }

    }



    @Override

    protected ArrayList getCopy(ArrayList array) {

        ArrayList<Fingerprint> result = new ArrayList<>();

        for (int i = 0; i < array.size(); i++) {

            Fingerprint fp = (Fingerprint) array.get(i);

    protected ArrayList<Fingerprint> getCopy(ArrayList<Fingerprint> array) {

        final ArrayList<Fingerprint> result = new ArrayList<>();

        for (Fingerprint fp : array) {

            result.add(new Fingerprint(fp.getName(), fp.getGroupId(), fp.getBiometricId(),

                    fp.getDeviceId()));

        }

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUtils.java

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.util.List; 
/**

 * Utility class for dealing with fingerprints and fingerprint settings.

 */

public class FingerprintUtils implements BiometricUtils {

public class FingerprintUtils implements BiometricUtils<Fingerprint> {



    private static final Object sInstanceLock = new Object();

    private static FingerprintUtils sInstance;
@@ -56,9 +56,8 @@ public class FingerprintUtils implements BiometricUtils { 
    }



    @Override

    public void addBiometricForUser(Context context, int userId,

            BiometricAuthenticator.Identifier identifier) {

        getStateForUser(context, userId).addBiometric(identifier);

    public void addBiometricForUser(Context context, int userId, Fingerprint fingerprint) {

        getStateForUser(context, userId).addBiometric(fingerprint);

    }



    @Override

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java

+6 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.hardware.biometrics.BiometricFaceConstants;

import android.hardware.biometrics.BiometricFingerprintConstants;

import android.hardware.biometrics.BiometricsProtoEnums;

import android.hardware.biometrics.common.ICancellationSignal;

import android.hardware.biometrics.fingerprint.ISession;

import android.hardware.fingerprint.IUdfpsOverlayController;
@@ -48,11 +49,12 @@ public class FingerprintEnrollClient extends EnrollClient<ISession> implements U 
    public FingerprintEnrollClient(@NonNull Context context,

            @NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token,

            @NonNull ClientMonitorCallbackConverter listener, int userId,

            @NonNull byte[] hardwareAuthToken, @NonNull String owner, @NonNull BiometricUtils utils,

            int statsModality, int sensorId,

            @NonNull byte[] hardwareAuthToken, @NonNull String owner,

            @NonNull FingerprintUtils utils, int sensorId,

            @Nullable IUdfpsOverlayController udfpsOvelayController, int maxTemplatesPerUser) {

        super(context, lazyDaemon, token, listener, userId, hardwareAuthToken, owner, utils,

                0 /* timeoutSec */, statsModality, sensorId, true /* shouldVibrate */);

                0 /* timeoutSec */, BiometricsProtoEnums.MODALITY_FINGERPRINT, sensorId,

                true /* shouldVibrate */);

        mUdfpsOverlayController = udfpsOvelayController;

        mMaxTemplatesPerUser = maxTemplatesPerUser;

    }
@@ -83,7 +85,7 @@ public class FingerprintEnrollClient extends EnrollClient<ISession> implements U 
    protected void startHalOperation() {

        UdfpsHelper.showUdfpsOverlay(getSensorId(), mUdfpsOverlayController);

        try {

            getFreshDaemon().enroll(mSequentialId,

            mCancellationSignal = getFreshDaemon().enroll(mSequentialId,

                    HardwareAuthTokenUtils.toHardwareAuthToken(mHardwareAuthToken));

        } catch (RemoteException e) {

            Slog.e(TAG, "Remote exception when requesting enroll", e);