Snap for 4930082 from 503fed748d8b2ba3aeeed90b2cc47e2efa70e62d to pi-qpr1-release (0abd37fd) · Commits · e / os / android_hardware_interfaces

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ bool verify_attestation_record(const string& challenge, const string& app_id,

		expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID, HidlBuf(app_id));

		EXPECT_GE(att_keymaster_version, 3U);
		EXPECT_EQ(att_keymaster_version, 4U);
		EXPECT_EQ(security_level, att_keymaster_security_level);
		EXPECT_EQ(security_level, att_attestation_security_level);

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+30 −20

Original line number	Diff line number	Diff line
		@@ -779,20 +779,27 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
		{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
		}

		if (radioRsp->rspInfo.error == RadioError::NONE) {
		/* Setting to carrier restriction needs some time */
		updateSimCardStatus();
		auto startTime = std::chrono::system_clock::now();
		while (cardStatus.cardState != CardState::RESTRICTED &&
		std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime)
		std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() -
		startTime)
		.count() < 10) {
		/* Set 2 seconds as interval to check card status */
		sleep(2);
		updateSimCardStatus();
		}
		EXPECT_EQ(CardState::RESTRICTED, cardStatus.cardState);
		}
		sleep(10);

		/* Reset back to no carrier restriction */
		/**
		* Another test case of the API to cover to allow carrier.
		* If the API is supported, this is also used to reset to no carrier restriction
		* status for cardStatus.
		*/
		memset(&carriers, 0, sizeof(carriers));
		carriers.allowedCarriers.resize(0);
		carriers.excludedCarriers.resize(0);
		@@ -808,11 +815,13 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
		{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
		}

		if (radioRsp->rspInfo.error == RadioError::NONE) {
		/* Resetting back to no carrier restriction needs some time */
		updateSimCardStatus();
		startTime = std::chrono::system_clock::now();
		auto startTime = std::chrono::system_clock::now();
		while (cardStatus.cardState == CardState::RESTRICTED &&
		std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime)
		std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() -
		startTime)
		.count() < 10) {
		/* Set 2 seconds as interval to check card status */
		sleep(2);
		@@ -821,6 +830,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
		EXPECT_NE(CardState::RESTRICTED, cardStatus.cardState);
		sleep(10);
		}
		}

		/*
		* Test IRadio.getAllowedCarriers() for the response returned.