release-request-aaaef485-cf88-426c-8186-1f3903a60dd5-for-git_oc-release-403887... (9fdc2005) · Commits · e / os / android_hardware_interfaces

audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp

+4 −12

Original line number	Diff line number	Diff line
		@@ -747,12 +747,12 @@ TEST_IO_STREAM(
		TEST_IO_STREAM(
		GetSampleRate,
		"Check that the stream sample rate == the one it was opened with",
		ASSERT_EQ(audioConfig.sampleRateHz, extract(stream->getSampleRate())))
		stream->getSampleRate())

		TEST_IO_STREAM(
		GetChannelMask,
		"Check that the stream channel mask == the one it was opened with",
		ASSERT_EQ(audioConfig.channelMask, extract(stream->getChannelMask())))
		stream->getChannelMask())

		TEST_IO_STREAM(GetFormat,
		"Check that the stream format == the one it was opened with",
		@@ -854,25 +854,17 @@ TEST_IO_STREAM(
		areAudioPatchesSupported() ? doc::partialTest("Audio patches are supported")
		: testSetDevice(stream.get(), address))

		static void testGetAudioProperties(IStream* stream,
		AudioConfig expectedConfig) {
		static void testGetAudioProperties(IStream* stream) {
		uint32_t sampleRateHz;
		AudioChannelMask mask;
		AudioFormat format;

		stream->getAudioProperties(returnIn(sampleRateHz, mask, format));

		// FIXME: the qcom hal it does not currently negotiate the sampleRate &
		// channel mask
		EXPECT_EQ(expectedConfig.sampleRateHz, sampleRateHz);
		EXPECT_EQ(expectedConfig.channelMask, mask);
		EXPECT_EQ(expectedConfig.format, format);
		}

		TEST_IO_STREAM(
		GetAudioProperties,
		"Check that the stream audio properties == the ones it was opened with",
		testGetAudioProperties(stream.get(), audioConfig))
		testGetAudioProperties(stream.get()))

		static void testConnectedState(IStream* stream) {
		DeviceAddress address = {};

compatibility_matrix.xml

+63 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,22 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.automotive.evs</name>
		<version>1.0</version>
		<interface>
		<name>IEvsEnumerator</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.automotive.vehicle</name>
		<version>2.0</version>
		<interface>
		<name>IVehicle</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.biometrics.fingerprint</name>
		<version>2.1</version>
		@@ -39,6 +55,14 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.broadcastradio</name>
		<version>1.0</version>
		<interface>
		<name>IBroadcastRadioFactory</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.camera.provider</name>
		<version>2.4</version>
		@@ -123,6 +147,14 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.health</name>
		<version>1.0</version>
		<interface>
		<name>IHealth</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.ir</name>
		<version>1.0</version>
		@@ -150,6 +182,10 @@
		<name>IOmx</name>
		<instance>default</instance>
		</interface>
		<interface>
		<name>IOmxStore</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.memtrack</name>
		@@ -227,6 +263,22 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.tv.cec</name>
		<version>1.0</version>
		<interface>
		<name>IHdmiCec</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.tv.input</name>
		<version>1.0</version>
		<interface>
		<name>ITvInput</name>
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.usb</name>
		<version>1.0</version>
		@@ -259,4 +311,15 @@
		<instance>default</instance>
		</interface>
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.wifi.supplicant</name>
		<version>1.0</version>
		<interface>
		<name>ISupplicant</name>
		<instance>default</instance>
		</interface>
		</hal>
		<kernel version="4.9.0" />
		<kernel version="4.4.0" />
		<kernel version="3.18.0" />
		</compatibility-matrix>

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

+6 −7

Original line number	Diff line number	Diff line
		@@ -200,8 +200,7 @@ void SensorsHidlEnvironment::pollingThread(
		bool needExit = *stop;

		while(!needExit) {
		env->sensors->poll(1,
		[&](auto result, const auto &events, const auto &dynamicSensorsAdded) {
		env->sensors->poll(64, [&](auto result, const auto& events, const auto& dynamicSensorsAdded) {
		if (result != Result::OK
		\|\| (events.size() == 0 && dynamicSensorsAdded.size() == 0)
		\|\| *stop) {
		@@ -209,8 +208,8 @@ void SensorsHidlEnvironment::pollingThread(
		return;
		}

		if (events.size() > 0) {
		env->addEvent(events[0]);
		for (const auto& e : events) {
		env->addEvent(e);
		}
		});
		}