Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Implement meta interface for the biometric HAL" into sc-dev am: 17206f514e

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

Change-Id: I32b1c78e7a083cf82ab5778b967b8377de0a4dfb
This commit is contained in:
Jiyong Park
2021-05-25 23:00:52 +00:00
committed by Automerger Merge Worker
parent 4302d9d309 17206f514e
commit 18f1ca7538
4 changed files with 108 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,6 +147,16 @@ public class Sensor {
mCallback = callback; mCallback = callback;
} }
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
@Override @Override
public void onChallengeGenerated(long challenge) { public void onChallengeGenerated(long challenge) {
mHandler.post(() -> { mHandler.post(() -> {

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

@@ -34,6 +34,16 @@ import android.util.Slog;
public class TestHal extends IFace.Stub { public class TestHal extends IFace.Stub {
private static final String TAG = "face.aidl.TestHal"; private static final String TAG = "face.aidl.TestHal";
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
@Override @Override
public SensorProps[] getSensorProps() { public SensorProps[] getSensorProps() {
Slog.w(TAG, "getSensorProps"); Slog.w(TAG, "getSensorProps");
@@ -45,6 +55,16 @@ public class TestHal extends IFace.Stub {
Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId); Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId);
return new ISession.Stub() { return new ISession.Stub() {
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
@Override @Override
public void generateChallenge() throws RemoteException { public void generateChallenge() throws RemoteException {
Slog.w(TAG, "generateChallenge"); Slog.w(TAG, "generateChallenge");
@@ -71,6 +91,14 @@ public class TestHal extends IFace.Stub {
public void cancel() throws RemoteException { public void cancel() throws RemoteException {
cb.onError(Error.CANCELED, 0 /* vendorCode */); 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 { public void cancel() throws RemoteException {
cb.onError(Error.CANCELED, 0 /* vendorCode */); 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 { public void cancel() throws RemoteException {
cb.onError(Error.CANCELED, 0 /* vendorCode */); cb.onError(Error.CANCELED, 0 /* vendorCode */);
} }
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
}; };
} }

10
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java
View File

@@ -150,6 +150,16 @@ class Sensor {
mCallback = callback; mCallback = callback;
} }
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
@Override @Override
public void onChallengeGenerated(long challenge) { public void onChallengeGenerated(long challenge) {
mHandler.post(() -> { mHandler.post(() -> {

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

@@ -32,6 +32,16 @@ import android.util.Slog;
public class TestHal extends IFingerprint.Stub { public class TestHal extends IFingerprint.Stub {
private static final String TAG = "fingerprint.aidl.TestHal"; private static final String TAG = "fingerprint.aidl.TestHal";
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
@Override @Override
public SensorProps[] getSensorProps() { public SensorProps[] getSensorProps() {
Slog.w(TAG, "getSensorProps"); Slog.w(TAG, "getSensorProps");
@@ -43,6 +53,16 @@ public class TestHal extends IFingerprint.Stub {
Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId); Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId);
return new ISession.Stub() { return new ISession.Stub() {
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
@Override @Override
public void generateChallenge() throws RemoteException { public void generateChallenge() throws RemoteException {
Slog.w(TAG, "generateChallenge"); Slog.w(TAG, "generateChallenge");
@@ -63,6 +83,14 @@ public class TestHal extends IFingerprint.Stub {
public void cancel() throws RemoteException { public void cancel() throws RemoteException {
cb.onError(Error.CANCELED, 0 /* vendorCode */); 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 { public void cancel() throws RemoteException {
cb.onError(Error.CANCELED, 0 /* vendorCode */); 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 { public void cancel() throws RemoteException {
cb.onError(Error.CANCELED, 0 /* vendorCode */); cb.onError(Error.CANCELED, 0 /* vendorCode */);
} }
@Override
public int getInterfaceVersion() {
return this.VERSION;
}
@Override
public String getInterfaceHash() {
return this.HASH;
}
}; };
} }