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

Commit 2a9c60de authored by Diya Bera's avatar Diya Bera
Browse files

Log all expected biometric enrollments 

Flag: N/A
Test: N/A
Bug: 324610934
Change-Id: I061aeb47a93d09656ed66d2840124c2e6b84d71f
parent 7d02389f

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java

+14 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.app.SynchronousUserSwitchObserver; 
import android.app.TaskStackListener;

import android.content.Context;

import android.content.pm.UserInfo;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricFaceConstants;

import android.hardware.biometrics.BiometricsProtoEnums;

import android.hardware.biometrics.ComponentInfoInternal;
@@ -39,6 +40,7 @@ import android.hardware.face.FaceEnrollOptions; 
import android.hardware.face.FaceSensorPropertiesInternal;

import android.hardware.face.IFaceServiceReceiver;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;
@@ -64,6 +66,7 @@ import com.android.server.biometrics.sensors.AuthenticationStateListeners; 
import com.android.server.biometrics.sensors.BaseClientMonitor;

import com.android.server.biometrics.sensors.BiometricScheduler;

import com.android.server.biometrics.sensors.BiometricStateCallback;

import com.android.server.biometrics.sensors.BiometricUtils;

import com.android.server.biometrics.sensors.ClientMonitorCallback;

import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;

import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
@@ -359,6 +362,17 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { 
                    null /* callback */);

        }



        if (Build.isDebuggable()) {

            BiometricUtils<Face> utils = FaceUtils.getInstance(

                    mFaceSensors.keyAt(0));

            for (UserInfo user : UserManager.get(mContext).getAliveUsers()) {

                List<Face> enrollments = utils.getBiometricsForUser(mContext, user.id);

                Slog.d(getTag(), "Expecting enrollments for user " + user.id + ": "

                        + enrollments.stream().map(

                        BiometricAuthenticator.Identifier::getBiometricId).toList());

            }

        }



        return mDaemon;

    }

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

+14 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.app.TaskStackListener; 
import android.content.Context;

import android.content.pm.UserInfo;

import android.content.res.TypedArray;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricsProtoEnums;

import android.hardware.biometrics.ComponentInfoInternal;

import android.hardware.biometrics.IInvalidationCallback;
@@ -46,6 +47,7 @@ import android.hardware.fingerprint.IFingerprintServiceReceiver; 
import android.hardware.fingerprint.ISidefpsController;

import android.hardware.fingerprint.IUdfpsOverlayController;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;
@@ -71,6 +73,7 @@ import com.android.server.biometrics.sensors.AuthenticationStateListeners; 
import com.android.server.biometrics.sensors.BaseClientMonitor;

import com.android.server.biometrics.sensors.BiometricScheduler;

import com.android.server.biometrics.sensors.BiometricStateCallback;

import com.android.server.biometrics.sensors.BiometricUtils;

import com.android.server.biometrics.sensors.ClientMonitorCallback;

import com.android.server.biometrics.sensors.ClientMonitorCallbackConverter;

import com.android.server.biometrics.sensors.ClientMonitorCompositeCallback;
@@ -382,6 +385,17 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 
                    null /* callback */);

        }



        if (Build.isDebuggable()) {

            BiometricUtils<Fingerprint> utils = FingerprintUtils.getInstance(

                    mFingerprintSensors.keyAt(0));

            for (UserInfo user : UserManager.get(mContext).getAliveUsers()) {

                List<Fingerprint> enrollments = utils.getBiometricsForUser(mContext, user.id);

                Slog.d(getTag(), "Expecting enrollments for user " + user.id + ": "

                        + enrollments.stream().map(

                                BiometricAuthenticator.Identifier::getBiometricId).toList());

            }

        }



        return mDaemon;

    }