From b51f1dbbbfb33944878fd1238295c9c9da50c278 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 21 May 2021 16:36:55 +0900 Subject: [PATCH] Implement meta interface for the biometric HAL The biometric HAL interfaces (android.hardware.biometric.face) were frozen as part of the SC API finalization. The users of the interface are required to implement the two meta interface (getInterfaceHash and getInterfaceVersion). Bug: 188713899 Test: m Change-Id: Ie87db2b845cbd9f8b643df2c047836743246ff35 --- .../biometrics/sensors/face/aidl/Sensor.java | 10 +++++ .../biometrics/sensors/face/aidl/TestHal.java | 44 +++++++++++++++++++ .../sensors/fingerprint/aidl/Sensor.java | 10 +++++ .../sensors/fingerprint/aidl/TestHal.java | 44 +++++++++++++++++++ 4 files changed, 108 insertions(+) diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java index 0e6a0f72206cc..2f71f44b6bef4 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java @@ -147,6 +147,16 @@ public class Sensor { mCallback = callback; } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override + public String getInterfaceHash() { + return this.HASH; + } + @Override public void onChallengeGenerated(long challenge) { mHandler.post(() -> { diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java index bf3f7b45dc4ad..525e508f2b6df 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/TestHal.java @@ -34,6 +34,16 @@ import android.util.Slog; public class TestHal extends IFace.Stub { private static final String TAG = "face.aidl.TestHal"; + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override + public String getInterfaceHash() { + return this.HASH; + } + @Override public SensorProps[] getSensorProps() { Slog.w(TAG, "getSensorProps"); @@ -45,6 +55,16 @@ public class TestHal extends IFace.Stub { Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId); return new ISession.Stub() { + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override + public String getInterfaceHash() { + return this.HASH; + } + @Override public void generateChallenge() throws RemoteException { Slog.w(TAG, "generateChallenge"); @@ -71,6 +91,14 @@ public class TestHal extends IFace.Stub { public void cancel() throws RemoteException { cb.onError(Error.CANCELED, 0 /* vendorCode */); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override + public String getInterfaceHash() { + return this.HASH; + } }; } @@ -82,6 +110,14 @@ public class TestHal extends IFace.Stub { public void cancel() throws RemoteException { cb.onError(Error.CANCELED, 0 /* vendorCode */); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override + public String getInterfaceHash() { + return this.HASH; + } }; } @@ -93,6 +129,14 @@ public class TestHal extends IFace.Stub { public void cancel() throws RemoteException { cb.onError(Error.CANCELED, 0 /* vendorCode */); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override + public String getInterfaceHash() { + return this.HASH; + } }; } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java index 10137b5a28c90..b3b818fd6d3db 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java @@ -150,6 +150,16 @@ class Sensor { mCallback = callback; } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override + public String getInterfaceHash() { + return this.HASH; + } + @Override public void onChallengeGenerated(long challenge) { mHandler.post(() -> { diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java index abc3597a5183b..e7719239d844a 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/TestHal.java @@ -32,6 +32,16 @@ import android.util.Slog; public class TestHal extends IFingerprint.Stub { private static final String TAG = "fingerprint.aidl.TestHal"; + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override + public String getInterfaceHash() { + return this.HASH; + } + @Override public SensorProps[] getSensorProps() { Slog.w(TAG, "getSensorProps"); @@ -43,6 +53,16 @@ public class TestHal extends IFingerprint.Stub { Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId); return new ISession.Stub() { + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + + @Override + public String getInterfaceHash() { + return this.HASH; + } + @Override public void generateChallenge() throws RemoteException { Slog.w(TAG, "generateChallenge"); @@ -63,6 +83,14 @@ public class TestHal extends IFingerprint.Stub { public void cancel() throws RemoteException { cb.onError(Error.CANCELED, 0 /* vendorCode */); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override + public String getInterfaceHash() { + return this.HASH; + } }; } @@ -74,6 +102,14 @@ public class TestHal extends IFingerprint.Stub { public void cancel() throws RemoteException { cb.onError(Error.CANCELED, 0 /* vendorCode */); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override + public String getInterfaceHash() { + return this.HASH; + } }; } @@ -85,6 +121,14 @@ public class TestHal extends IFingerprint.Stub { public void cancel() throws RemoteException { cb.onError(Error.CANCELED, 0 /* vendorCode */); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override + public String getInterfaceHash() { + return this.HASH; + } }; }