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

Commit 02c760e0 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge "Update TestHal with new getFeatures/setFeature" into sc-dev am: 5c3e1245 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14189239

Change-Id: I6ed7511b59553422f389ee1401ce793069c21afe
parents c68bc840 5c3e1245

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

+2 −2
Original line number Diff line number Diff line
@@ -375,12 +375,12 @@ public class Sensor { 
        }



        @Override

        public void onFeaturesRetrieved(byte[] features, int enrollmentId) {

        public void onFeaturesRetrieved(byte[] features) {



        }



        @Override

        public void onFeatureSet(int enrollmentId, byte feature) {

        public void onFeatureSet(byte feature) {



        }

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

+6 −5
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.util.Slog; 
 */

public class TestHal extends IFace.Stub {

    private static final String TAG = "face.aidl.TestHal";



    @Override

    public SensorProps[] getSensorProps() {

        Slog.w(TAG, "getSensorProps");
@@ -102,16 +103,16 @@ public class TestHal extends IFace.Stub { 
            }



            @Override

            public void getFeatures(int enrollmentId) throws RemoteException {

            public void getFeatures() throws RemoteException {

                Slog.w(TAG, "getFeatures");

                cb.onFeaturesRetrieved(new byte[0], enrollmentId);

                cb.onFeaturesRetrieved(new byte[0]);

            }



            @Override

            public void setFeature(HardwareAuthToken hat, int enrollmentId,

                    byte feature, boolean enabled) throws RemoteException {

            public void setFeature(HardwareAuthToken hat, byte feature, boolean enabled)

                    throws RemoteException {

                Slog.w(TAG, "setFeature");

                cb.onFeatureSet(enrollmentId, feature);

                cb.onFeatureSet(feature);

            }



            @Override