Snap for 5533229 from 282c8d0694bacf095db4053909936585db9f54c0 to qt-release (860ab50a) · Commits · e / os / android_hardware_interfaces

current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ f7d7cb747dc01a9fdb2d39a80003b4d8df9be733d65f5842198802eb6209db69 android.hardwar
		b7ecf29927055ec422ec44bf776223f07d79ad9f92ccf9becf167e62c2607e7a android.hardware.keymaster@4.0::IKeymasterDevice
		574e8f1499436fb4075894dcae0b36682427956ecb114f17f1fe22d116a83c6b android.hardware.neuralnetworks@1.0::IPreparedModel
		e75759b40a1c5f97b463b30aab91954012c9ea9e454dde308db853a56796e5a6 android.hardware.neuralnetworks@1.0::types
		d51937a3567a50f239589e40300264c4b57f2c3582c6fc6df082f45eb74d90e3 android.hardware.neuralnetworks@1.1::types
		eb754b58c93e5591613208b4c972811288b0fa16a82430d602f107c91a908b22 android.hardware.neuralnetworks@1.1::types
		1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse
		ed9da80ec0c96991fd03f0a46107815d0e50f764656e49dba4980fa5c31d5bc3 android.hardware.radio@1.0::types
		1d19720d4fd38b1095f0f555a4bd92b3b12c9b1d0f560b0e9a474cd6dcc20db6 android.hardware.radio@1.2::IRadio
		@@ -515,7 +515,7 @@ b83317b66721241887d2770b5ae95fd5af1e77c5daa7530ecb08fae8892f2b43 android.hardwar
		92714960d1a53fc2ec557302b41c7cc93d2636d8364a44bd0f85be0c92927ff8 android.hardware.neuralnetworks@1.2::IExecutionCallback
		36e1064c869965dee533c537cefbe87e54db8bd8cd45be7e0e93e00e8a43863a android.hardware.neuralnetworks@1.2::IPreparedModel
		e1c734d1545e1a4ae749ff1dd9704a8e594c59aea7c8363159dc258e93e0df3b android.hardware.neuralnetworks@1.2::IPreparedModelCallback
		30f6da776bf909fc139f2bc4c176b5a74e9db0978240efcd7429d04e221bfaee android.hardware.neuralnetworks@1.2::types
		e3b6176e3bf235c4e0e4e451b0166e396c7ee176cfe167c9147c3d46d7b34f0c android.hardware.neuralnetworks@1.2::types
		cf7a4ba516a638f9b82a249c91fb603042c2d9ca43fd5aad9cf6c0401ed2a5d7 android.hardware.nfc@1.2::INfc
		abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardware.nfc@1.2::types
		4cb252dc6372a874aef666b92a6e9529915aa187521a700f0789065c3c702ead android.hardware.power.stats@1.0::IPowerStats

gnss/2.0/vts/functional/gnss_hal_test_cases.cpp

+44 −55

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ using IGnssMeasurement_2_0 = android::hardware::gnss::V2_0::IGnssMeasurement;
		using IGnssMeasurement_1_1 = android::hardware::gnss::V1_1::IGnssMeasurement;
		using IGnssMeasurement_1_0 = android::hardware::gnss::V1_0::IGnssMeasurement;
		using IAGnssRil_2_0 = android::hardware::gnss::V2_0::IAGnssRil;
		using IAGnssRil_1_0 = android::hardware::gnss::V1_0::IAGnssRil;
		using IAGnss_2_0 = android::hardware::gnss::V2_0::IAGnss;
		using IAGnss_1_0 = android::hardware::gnss::V1_0::IAGnss;
		using IAGnssCallback_2_0 = android::hardware::gnss::V2_0::IAGnssCallback;
		@@ -125,16 +126,21 @@ TEST_F(GnssHalTest, TestGnssConfiguration_setGpsLock_Deprecation) {
		* TestAGnssRilExtension:
		* Gets the AGnssRilExtension and verifies that it returns an actual extension.
		*
		* The GNSS HAL 2.0 implementation must support @2.0::IAGnssRil interface due to the deprecation
		* of framework network API methods needed to support the @1.0::IAGnssRil interface.
		*
		* TODO (b/121287858): Enforce gnss@2.0 HAL package is supported on devices launched with Q or later
		* If IAGnssRil interface is supported, then the GNSS HAL 2.0 implementation must support
		* @2.0::IAGnssRil interface due to the deprecation of framework network API methods needed
		* to support the @1.0::IAGnssRil interface.
		*/
		TEST_F(GnssHalTest, TestAGnssRilExtension) {
		auto agnssRil = gnss_hal_->getExtensionAGnssRil_2_0();
		ASSERT_TRUE(agnssRil.isOk());
		sp<IAGnssRil_2_0> iAGnssRil = agnssRil;
		ASSERT_NE(iAGnssRil, nullptr);
		auto agnssRil_2_0 = gnss_hal_->getExtensionAGnssRil_2_0();
		ASSERT_TRUE(agnssRil_2_0.isOk());
		sp<IAGnssRil_2_0> iAGnssRil_2_0 = agnssRil_2_0;
		if (iAGnssRil_2_0 == nullptr) {
		// Verify IAGnssRil 1.0 is not supported.
		auto agnssRil_1_0 = gnss_hal_->getExtensionAGnssRil();
		ASSERT_TRUE(agnssRil_1_0.isOk());
		sp<IAGnssRil_1_0> iAGnssRil_1_0 = agnssRil_1_0;
		ASSERT_EQ(iAGnssRil_1_0, nullptr);
		}
		}

		/*
		@@ -146,7 +152,9 @@ TEST_F(GnssHalTest, TestAGnssRil_UpdateNetworkState_2_0) {
		auto agnssRil = gnss_hal_->getExtensionAGnssRil_2_0();
		ASSERT_TRUE(agnssRil.isOk());
		sp<IAGnssRil_2_0> iAGnssRil = agnssRil;
		ASSERT_NE(iAGnssRil, nullptr);
		if (iAGnssRil == nullptr) {
		return;
		}

		// Update GNSS HAL that a network has connected.
		IAGnssRil_2_0::NetworkAttributes networkAttributes = {
		@@ -219,44 +227,35 @@ TEST_F(GnssHalTest, TestGnssMeasurementFields) {

		/*
		* TestAGnssExtension:
		* Gets the AGnssExtension and verifies that it supports @2.0::IAGnss interface by invoking
		* a method.
		* Gets the AGnssExtension and verifies that it returns an actual extension.
		*
		* The GNSS HAL 2.0 implementation must support @2.0::IAGnss interface due to the deprecation
		* of framework network API methods needed to support the @1.0::IAGnss interface.
		*
		* TODO (b/121287858): Enforce gnss@2.0 HAL package is supported on devices launched with Q or later
		* If IAGnss interface is supported, then the GNSS HAL 2.0 implementation must support
		* @2.0::IAGnss interface due to the deprecation of framework network API methods needed
		* to support the @1.0::IAGnss interface.
		*/
		TEST_F(GnssHalTest, TestAGnssExtension) {
		// Verify IAGnss 2.0 is supported.
		auto agnss = gnss_hal_->getExtensionAGnss_2_0();
		ASSERT_TRUE(agnss.isOk());
		sp<IAGnss_2_0> iAGnss = agnss;
		ASSERT_NE(iAGnss, nullptr);
		auto agnss_2_0 = gnss_hal_->getExtensionAGnss_2_0();
		ASSERT_TRUE(agnss_2_0.isOk());
		sp<IAGnss_2_0> iAGnss_2_0 = agnss_2_0;
		if (iAGnss_2_0 == nullptr) {
		// Verify IAGnss 1.0 is not supported.
		auto agnss_1_0 = gnss_hal_->getExtensionAGnss();
		ASSERT_TRUE(agnss_1_0.isOk());
		sp<IAGnss_1_0> iAGnss_1_0 = agnss_1_0;
		ASSERT_EQ(iAGnss_1_0, nullptr);
		return;
		}

		// Set SUPL server host/port
		auto result = iAGnss->setServer(IAGnssCallback_2_0::AGnssType::SUPL, "supl.google.com", 7275);
		auto result =
		iAGnss_2_0->setServer(IAGnssCallback_2_0::AGnssType::SUPL, "supl.google.com", 7275);
		ASSERT_TRUE(result.isOk());
		EXPECT_TRUE(result);
		}

		/*
		* TestAGnssExtension_1_0_Deprecation:
		* Gets the @1.0::IAGnss extension and verifies that it is a nullptr.
		*
		* TODO (b/121287858): Enforce gnss@2.0 HAL package is supported on devices launched with Q or later
		*/
		TEST_F(GnssHalTest, TestAGnssExtension_1_0_Deprecation) {
		// Verify IAGnss 1.0 is not supported.
		auto agnss_1_0 = gnss_hal_->getExtensionAGnss();
		ASSERT_TRUE(!agnss_1_0.isOk() \|\| ((sp<IAGnss_1_0>)agnss_1_0) == nullptr);
		}

		/*
		* TestGnssNiExtension_Deprecation:
		* Gets the @1.0::IGnssNi extension and verifies that it is a nullptr.
		*
		* TODO (b/121287858): Enforce gnss@2.0 HAL package is supported on devices launched with Q or later
		*/
		TEST_F(GnssHalTest, TestGnssNiExtension_Deprecation) {
		// Verify IGnssNi 1.0 is not supported.
		@@ -266,22 +265,19 @@ TEST_F(GnssHalTest, TestGnssNiExtension_Deprecation) {

		/*
		* TestGnssVisibilityControlExtension:
		* Gets the GnssVisibilityControlExtension and verifies that it supports the
		* gnss.visibility_control@1.0::IGnssVisibilityControl interface by invoking a method.
		*
		* The GNSS HAL 2.0 implementation must support gnss.visibility_control@1.0::IGnssVisibilityControl.
		*
		* TODO (b/121287858): Enforce gnss@2.0 HAL package is supported on devices launched with Q or later
		* Gets the GnssVisibilityControlExtension and if it is not null, verifies that it supports
		* the gnss.visibility_control@1.0::IGnssVisibilityControl interface by invoking a method.
		*/
		TEST_F(GnssHalTest, TestGnssVisibilityControlExtension) {
		// Verify IGnssVisibilityControl is supported.
		auto gnssVisibilityControl = gnss_hal_->getExtensionVisibilityControl();
		ASSERT_TRUE(gnssVisibilityControl.isOk());
		sp<IGnssVisibilityControl> iGnssVisibilityControl = gnssVisibilityControl;
		ASSERT_NE(iGnssVisibilityControl, nullptr);
		if (iGnssVisibilityControl == nullptr) {
		return;
		}

		// Set non-framework proxy apps.
		hidl_vec<hidl_string> proxyApps{"ims.example.com", "mdt.example.com"};
		hidl_vec<hidl_string> proxyApps{"com.example.ims", "com.example.mdt"};
		auto result = iGnssVisibilityControl->enableNfwLocationAccess(proxyApps);
		ASSERT_TRUE(result.isOk());
		EXPECT_TRUE(result);
		@@ -408,17 +404,10 @@ TEST_F(GnssHalTest, TestInjectBestLocation_2_0) {

		/*
		* TestGnssBatchingExtension:
		* Gets the GnssBatchingExtension and verifies that it supports either the @1.0::IGnssBatching
		* or @2.0::IGnssBatching extension.
		* Gets the @2.0::IGnssBatching extension and verifies that it doesn't return an error. Support
		* for this interface is optional.
		*/
		TEST_F(GnssHalTest, TestGnssBatchingExtension) {
		auto gnssBatching_V2_0 = gnss_hal_->getExtensionGnssBatching_2_0();
		ASSERT_TRUE(gnssBatching_V2_0.isOk());

		auto gnssBatching_V1_0 = gnss_hal_->getExtensionGnssBatching();
		ASSERT_TRUE(gnssBatching_V1_0.isOk());

		sp<IGnssBatching_V1_0> iGnssBatching_V1_0 = gnssBatching_V1_0;
		sp<IGnssBatching_V2_0> iGnssBatching_V2_0 = gnssBatching_V2_0;
		ASSERT_TRUE(iGnssBatching_V1_0 != nullptr \|\| iGnssBatching_V2_0 != nullptr);
		auto gnssBatching_2_0 = gnss_hal_->getExtensionGnssBatching_2_0();
		ASSERT_TRUE(gnssBatching_2_0.isOk());
		}

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@ bool verify_attestation_record(const string& challenge, const string& app_id,
		strptime(date.c_str(), "%Y-%m-%d", &time);

		// Day of the month (0-31)
		EXPECT_GT(time.tm_mday, 0);
		EXPECT_GE(time.tm_mday, 0);
		EXPECT_LT(time.tm_mday, 32);
		// Months since Jan (0-11)
		EXPECT_GE(time.tm_mon, 0);

neuralnetworks/1.1/types.hal

+4 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ enum OperationType : @1.0::OperationType {
		*
		* Supported tensor {@link OperandType}:
		* * {@link OperandType::TENSOR_FLOAT32}
		* * {@link OperandType::TENSOR_QUANT8_ASYMM}
		* * {@link OperandType::TENSOR_QUANT8_ASYMM} (the pad value is undefined)
		*
		* Supported tensor rank: up to 4
		*
		@@ -161,6 +161,9 @@ enum OperationType : @1.0::OperationType {
		* output0.dimension[i] =
		* padding[i, 0] + input0.dimension[i] + padding[i, 1]
		*
		* NOTE: The pad value for {@link ANEURALNETWORKS_TENSOR_QUANT8_ASYMM}
		* is undefined.
		*
		* Available since API level 28.
		*/
		PAD = 32,

neuralnetworks/1.2/types.hal

+6 −1

Original line number	Diff line number	Diff line
		@@ -1999,7 +1999,8 @@ enum OperationType : int32_t {
		* Supported tensor {@link OperandType}:
		* * {@link OperandType::TENSOR_FLOAT16} (since API level 29)
		* * {@link OperandType::TENSOR_FLOAT32}
		* * {@link OperandType::TENSOR_QUANT8_ASYMM}
		* * {@link OperandType::TENSOR_QUANT8_ASYMM} (full support since API
		* level 29, see the output section)
		*
		* Supported tensor rank: up to 4
		*
		@@ -2022,6 +2023,10 @@ enum OperationType : int32_t {
		* output0.dimension[i] =
		* padding[i, 0] + input0.dimension[i] + padding[i, 1]
		*
		* NOTE: Before API level 29, the pad value for
		* {@link ANEURALNETWORKS_TENSOR_QUANT8_ASYMM} is undefined.
		* Since API level 29, the pad value is always the logical zero.
		*
		* Available since API level 28.
		*/
		PAD = @1.1::OperationType:PAD,