Snap for 7435440 from b0bd8ad47e78a27b807448177d605993c60169a5 to sc-d1-release (15f071e7) · Commits · e / os / android_hardware_interfaces

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+38 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,39 @@

		#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())

		/*
		* Test IRadio.setAllowedNetworkTypesBitmap for the response returned.
		*/
		TEST_P(RadioHidlTest_v1_6, setAllowedNetworkTypesBitmap) {
		serial = GetRandomSerialNumber();
		::android::hardware::hidl_bitfield<::android::hardware::radio::V1_4::RadioAccessFamily>
		allowedNetworkTypesBitmap{};
		allowedNetworkTypesBitmap \|= ::android::hardware::radio::V1_4::RadioAccessFamily::LTE;

		radio_v1_6->setAllowedNetworkTypesBitmap(serial, allowedNetworkTypesBitmap);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);

		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		} else {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::NONE,
		::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
		::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED,
		::android::hardware::radio::V1_6::RadioError::MODE_NOT_SUPPORTED,
		::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
		::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,
		::android::hardware::radio::V1_6::RadioError::MODEM_ERR,
		::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));
		}
		}

		/*
		* Test IRadio.setupDataCall_1_6() for the response returned.
		*/
		@@ -865,7 +898,11 @@ TEST_P(RadioHidlTest_v1_6, updateSimPhonebookRecords) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		EXPECT_EQ(::android::hardware::radio::V1_6::RadioError::NONE, radioRsp_v1_6->rspInfo.error);
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::NONE,
		::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED},
		CHECK_GENERAL_ERROR));

		if(pbCapacity.maxAdnRecords > 0
		&& pbCapacity.usedAdnRecords < pbCapacity.maxAdnRecords) {

tests/extension/vibrator/aidl/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,9 @@ aidl_interface {
		// This is agreeing to keep the interface stable.
		stability: "vintf",

		// This is a testing-purpose interface. Fine to use unstable version on REL platform.
		owner: "test",

		// This happens to use types from a core interface, so we import it, but
		// this won't always be needed.
		imports: [

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@ class TunerFrontendHidlTest : public testing::TestWithParam<std::string> {
		FrontendTests mFrontendTests;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFrontendHidlTest);

		class TunerLnbHidlTest : public testing::TestWithParam<std::string> {
		@@ -101,7 +100,6 @@ class TunerLnbHidlTest : public testing::TestWithParam<std::string> {
		LnbTests mLnbTests;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerLnbHidlTest);

		class TunerDemuxHidlTest : public testing::TestWithParam<std::string> {
		@@ -127,7 +125,6 @@ class TunerDemuxHidlTest : public testing::TestWithParam<std::string> {
		FilterTests mFilterTests;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDemuxHidlTest);

		class TunerFilterHidlTest : public testing::TestWithParam<std::string> {
		@@ -179,7 +176,6 @@ class TunerFilterHidlTest : public testing::TestWithParam<std::string> {
		FilterTests mFilterTests;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFilterHidlTest);

		class TunerBroadcastHidlTest : public testing::TestWithParam<std::string> {
		@@ -218,7 +214,6 @@ class TunerBroadcastHidlTest : public testing::TestWithParam<std::string> {
		uint32_t* mLnbId = nullptr;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerBroadcastHidlTest);

		class TunerPlaybackHidlTest : public testing::TestWithParam<std::string> {
		@@ -250,7 +245,6 @@ class TunerPlaybackHidlTest : public testing::TestWithParam<std::string> {
		void playbackSingleFilterTest(FilterConfig filterConf, DvrConfig dvrConf);
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerPlaybackHidlTest);

		class TunerRecordHidlTest : public testing::TestWithParam<std::string> {
		@@ -290,7 +284,6 @@ class TunerRecordHidlTest : public testing::TestWithParam<std::string> {
		uint32_t* mLnbId = nullptr;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerRecordHidlTest);

		class TunerDescramblerHidlTest : public testing::TestWithParam<std::string> {
		@@ -327,6 +320,5 @@ class TunerDescramblerHidlTest : public testing::TestWithParam<std::string> {
		DvrTests mDvrTests;
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDescramblerHidlTest);
		} // namespace

tv/tuner/1.1/default/Dvr.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,6 @@ Return<Result> Dvr::attachFilter(const sp<V1_0::IFilter>& filter) {
		return status;
		}

		// TODO check if the attached filter is a record filter
		if (!mDemux->attachRecordFilter(filterId)) {
		return Result::INVALID_ARGUMENT;
		}

tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -156,6 +156,5 @@ class TunerBroadcastHidlTest : public testing::TestWithParam<std::string> {
		FrontendConfig1_1 frontendConf);
		};

		// TODO remove from the allow list once the cf tv target is enabled for testing
		GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerBroadcastHidlTest);
		} // namespace