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

Commit 839c298c authored by Joe Bolinger's avatar Joe Bolinger Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hal-logs" 

* changes:
  Add new methods to TestHal.
  Add new methods to TestHAL.
parents 7246a14c 7de78b43

services/core/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ java_library_static { 
    name: "services.core.unboosted",

    defaults: ["platform_service_defaults"],

    srcs: [

        ":android.hardware.biometrics.face-V1-java-source",

        ":android.hardware.biometrics.face-V2-java-source",

        ":statslog-art-java-gen",

        ":statslog-contexthub-java-gen",

        ":services.core-sources",

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

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



import android.hardware.biometrics.common.ICancellationSignal;

import android.hardware.biometrics.common.OperationContext;

import android.hardware.biometrics.face.EnrollmentStageConfig;

import android.hardware.biometrics.face.Error;

import android.hardware.biometrics.face.IFace;
@@ -188,6 +189,24 @@ public class TestHal extends IFace.Stub { 
                Slog.w(TAG, "close");

                cb.onSessionClosed();

            }



            @Override

            public ICancellationSignal authenticateWithContext(

                    long operationId, OperationContext context) {

                return authenticate(operationId);

            }



            @Override

            public ICancellationSignal enrollWithContext(

                    HardwareAuthToken hat, byte enrollmentType, byte[] features,

                    NativeHandle previewSurface, OperationContext context) {

                return enroll(hat, enrollmentType, features, previewSurface);

            }



            @Override

            public ICancellationSignal detectInteractionWithContext(OperationContext context) {

                return detectInteraction();

            }

        };

    }

}

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

+30 −0
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
package com.android.server.biometrics.sensors.fingerprint.aidl;



import android.hardware.biometrics.common.ICancellationSignal;

import android.hardware.biometrics.common.OperationContext;

import android.hardware.biometrics.fingerprint.Error;

import android.hardware.biometrics.fingerprint.IFingerprint;

import android.hardware.biometrics.fingerprint.ISession;

import android.hardware.biometrics.fingerprint.ISessionCallback;

import android.hardware.biometrics.fingerprint.PointerContext;

import android.hardware.biometrics.fingerprint.SensorProps;

import android.hardware.keymaster.HardwareAuthToken;

import android.os.RemoteException;
@@ -182,6 +184,34 @@ public class TestHal extends IFingerprint.Stub { 
            public void onUiReady() {

                Slog.w(TAG, "onUiReady");

            }



            @Override

            public ICancellationSignal authenticateWithContext(

                    long operationId, OperationContext context) {

                return authenticate(operationId);

            }



            @Override

            public ICancellationSignal enrollWithContext(

                    HardwareAuthToken hat, OperationContext context) {

                return enroll(hat);

            }



            @Override

            public ICancellationSignal detectInteractionWithContext(OperationContext context) {

                return detectInteraction();

            }



            @Override

            public void onPointerDownWithContext(PointerContext context) {

                onPointerDown(

                        context.pointerId, context.x, context.y, context.minor, context.major);

            }



            @Override

            public void onPointerUpWithContext(PointerContext context) {

                onPointerUp(context.pointerId);

            }

        };

    }

}