release-request-8a29fe1b-a466-48e3-824a-9b3737e5c08a-for-git_oc-release-411599... (df6da6be) · Commits · e / os / android_hardware_interfaces

nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp

+5 −10

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@ using ::android::sp;
		{ 0x20, 0x01, 0x00 }
		#define INVALID_COMMAND \
		{ 0x20, 0x00, 0x00 }
		#define FAULTY_DATA_PACKET \
		{ 0x00, 0x00, 0xFF }

		#define LOOP_BACK_HEADER_SIZE 3
		#define SYNTAX_ERROR 5
		@@ -271,8 +269,8 @@ TEST_F(NfcHidlTest, WriteInvalidCommand) {

		/*
		* WriteInvalidAndThenValidCommand:
		* Sends an Faulty Data Packet
		* Waits for CORE_INTERFACE_ERROR_NTF
		* Sends an Invalid command
		* Waits for response
		* Checks SYNTAX_ERROR status
		* Repeat for 100 times appending 0xFF each time to the packet
		* Send CORE_CONN_CREATE_CMD for loop-back mode
		@@ -303,7 +301,7 @@ TEST_F(NfcHidlTest, WriteInvalidAndThenValidCommand) {
		EXPECT_EQ((int)NfcStatus::OK, res.args->last_data_[3]);

		// Send an Error Data Packet
		cmd = FAULTY_DATA_PACKET;
		cmd = INVALID_COMMAND;
		data = cmd;
		size_t size = data.size();

		@@ -311,13 +309,10 @@ TEST_F(NfcHidlTest, WriteInvalidAndThenValidCommand) {
		data.resize(++size);
		data[size - 1] = 0xFF;
		EXPECT_EQ(data.size(), nfc_->write(data));
		// Wait for CORE_INTERFACE_ERROR_NTF
		// Wait for response with SYNTAX_ERROR
		res = nfc_cb_->WaitForCallback(kCallbackNameSendData);
		EXPECT_TRUE(res.no_timeout);
		EXPECT_EQ(5ul, res.args->last_data_.size());
		EXPECT_EQ(0x60, res.args->last_data_[0]);
		EXPECT_EQ(0x08, res.args->last_data_[1]);
		EXPECT_EQ(0x02, res.args->last_data_[2]);
		EXPECT_EQ(4ul, res.args->last_data_.size());
		EXPECT_EQ(SYNTAX_ERROR, res.args->last_data_[3]);
		}

+12 −10

Original line number	Diff line number	Diff line
		@@ -67,9 +67,11 @@ void convertFromSensorEvent(const sensors_event_t &src, Event *dst) {
		typedef ::android::hardware::sensors::V1_0::SensorType SensorType;
		typedef ::android::hardware::sensors::V1_0::MetaDataEventType MetaDataEventType;

		dst->sensorHandle = src.sensor;
		dst->sensorType = (SensorType)src.type;
		dst->timestamp = src.timestamp;
		*dst = {
		.sensorHandle = src.sensor,
		.sensorType = (SensorType)src.type,
		.timestamp = src.timestamp
		};

		switch (dst->sensorType) {
		case SensorType::META_DATA:
		@@ -206,13 +208,13 @@ void convertFromSensorEvent(const sensors_event_t &src, Event *dst) {
		}

		void convertToSensorEvent(const Event &src, sensors_event_t *dst) {
		dst->version = sizeof(sensors_event_t);
		dst->sensor = src.sensorHandle;
		dst->type = (int32_t)src.sensorType;
		dst->reserved0 = 0;
		dst->timestamp = src.timestamp;
		dst->flags = 0;
		dst->reserved1[0] = dst->reserved1[1] = dst->reserved1[2] = 0;
		*dst = {
		.version = sizeof(sensors_event_t),
		.sensor = src.sensorHandle,
		.type = (int32_t)src.sensorType,
		.reserved0 = 0,
		.timestamp = src.timestamp
		};

		switch (src.sensorType) {
		case SensorType::META_DATA:

+3 −1

Original line number	Diff line number	Diff line
		@@ -697,6 +697,7 @@ void SensorsHidlTest::assertDelayMatchReportMode(
		SensorFlagBits SensorsHidlTest::expectedReportModeForType(SensorType type) {
		switch (type) {
		case SensorType::ACCELEROMETER:
		case SensorType::ACCELEROMETER_UNCALIBRATED:
		case SensorType::GYROSCOPE:
		case SensorType::MAGNETIC_FIELD:
		case SensorType::ORIENTATION:
		@@ -719,7 +720,6 @@ SensorFlagBits SensorsHidlTest::expectedReportModeForType(SensorType type) {
		case SensorType::AMBIENT_TEMPERATURE:
		case SensorType::HEART_RATE:
		case SensorType::DEVICE_ORIENTATION:
		case SensorType::MOTION_DETECT:
		case SensorType::STEP_COUNTER:
		case SensorType::LOW_LATENCY_OFFBODY_DETECT:
		return SensorFlagBits::ON_CHANGE_MODE;
		@@ -728,6 +728,8 @@ SensorFlagBits SensorsHidlTest::expectedReportModeForType(SensorType type) {
		case SensorType::WAKE_GESTURE:
		case SensorType::GLANCE_GESTURE:
		case SensorType::PICK_UP_GESTURE:
		case SensorType::MOTION_DETECT:
		case SensorType::STATIONARY_DETECT:
		return SensorFlagBits::ONE_SHOT_MODE;

		case SensorType::STEP_DETECTOR: