Merge changes from topics "biometrics.face@1.1-revert",... (c3af7ef0) · Commits · e / os / android_hardware_interfaces

biometrics/face/1.1/default/Android.bp→biometrics/face/1.0/default/Android.bp

+2 −3

Original line number	Diff line number	Diff line
		@@ -15,10 +15,10 @@
		*/

		cc_binary {
		name: "android.hardware.biometrics.face@1.1-service.example",
		name: "android.hardware.biometrics.face@1.0-service.example",
		defaults: ["hidl_defaults"],
		vendor: true,
		init_rc: ["android.hardware.biometrics.face@1.1-service.rc"],
		init_rc: ["android.hardware.biometrics.face@1.0-service.rc"],
		vintf_fragments: ["manifest_face_default.xml"],
		relative_install_path: "hw",
		proprietary: true,
		@@ -31,6 +31,5 @@ cc_binary {
		"libutils",
		"liblog",
		"android.hardware.biometrics.face@1.0",
		"android.hardware.biometrics.face@1.1",
		],
		}

+0 −16

Original line number	Diff line number	Diff line
		@@ -110,20 +110,4 @@ Return<Status> BiometricsFace::resetLockout(const hidl_vec<uint8_t>& /* hat */)
		return Status::OK;
		}

		// Methods from ::android::hardware::biometrics::face::V1_1::IBiometricsFace follow.
		Return<Status> BiometricsFace::enroll_1_1(const hidl_vec<uint8_t>& /* hat */,
		uint32_t /* timeoutSec */,
		const hidl_vec<Feature>& /* disabledFeatures */,
		const hidl_handle& /* windowId */) {
		mClientCallback->onError(kDeviceId, mUserId, FaceError::UNABLE_TO_PROCESS, 0 /* vendorCode */);
		return Status::OK;
		}

		Return<Status> BiometricsFace::enrollRemotely(const hidl_vec<uint8_t>& /* hat */,
		uint32_t /* timeoutSec */,
		const hidl_vec<Feature>& /* disabledFeatures */) {
		mClientCallback->onError(kDeviceId, mUserId, FaceError::UNABLE_TO_PROCESS, 0 /* vendorCode */);
		return Status::OK;
		}

		} // namespace android::hardware::biometrics::face::implementation

+2 −10

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#pragma once

		#include <android/hardware/biometrics/face/1.1/IBiometricsFace.h>
		#include <android/hardware/biometrics/face/1.0/IBiometricsFace.h>
		#include <hidl/MQDescriptor.h>
		#include <hidl/Status.h>
		#include <random>
		@@ -34,7 +34,7 @@ using ::android::hardware::biometrics::face::V1_0::Feature;
		using ::android::hardware::biometrics::face::V1_0::IBiometricsFaceClientCallback;
		using ::android::hardware::biometrics::face::V1_0::Status;

		class BiometricsFace : public V1_1::IBiometricsFace {
		class BiometricsFace : public V1_0::IBiometricsFace {
		public:
		BiometricsFace();

		@@ -71,14 +71,6 @@ class BiometricsFace : public V1_1::IBiometricsFace {

		Return<Status> resetLockout(const hidl_vec<uint8_t>& hat) override;

		// Methods from ::android::hardware::biometrics::face::V1_1::IBiometricsFace follow.
		Return<Status> enroll_1_1(const hidl_vec<uint8_t>& hat, uint32_t timeoutSec,
		const hidl_vec<Feature>& disabledFeatures,
		const hidl_handle& windowId) override;

		Return<Status> enrollRemotely(const hidl_vec<uint8_t>& hat, uint32_t timeoutSec,
		const hidl_vec<Feature>& disabledFeatures) override;

		private:
		std::mt19937 mRandom;
		int32_t mUserId;

+1 −1

Original line number	Diff line number	Diff line
		service vendor.face-hal-1-1-default /vendor/bin/hw/android.hardware.biometrics.face@1.1-service.example
		service vendor.face-hal-1-0-default /vendor/bin/hw/android.hardware.biometrics.face@1.0-service.example
		# "class hal" causes a race condition on some devices due to files created
		# in /data. As a workaround, postpone startup until later in boot once
		# /data is mounted.

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		<hal format="hidl">
		<name>android.hardware.biometrics.face</name>
		<transport>hwbinder</transport>
		<version>1.1</version>
		<version>1.0</version>
		<interface>
		<name>IBiometricsFace</name>
		<instance>default</instance>