Merge "Implement meta interface for the biometric HAL" into sc-dev (17206f51) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -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(() -> {

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

+44 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		};
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -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(() -> {

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

+44 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		};
		}