Snap for 6634345 from 500aabe2d429384349ec2ed9672b383a3b4d5da4 to mainline-release (d9539e32) · Commits · e / os / android_hardware_interfaces

current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -722,6 +722,7 @@ ee9dc34b9925b8367b1111c72bd6d9d375432735e451572ca5a665d8516a7744 android.hardwar
		eee3430cc86c97c7b407495863d8fb61da6f1a64b7721e77b9b4909b11b174e9 android.hardware.neuralnetworks@1.3::IPreparedModelCallback
		acf84925f8ee0a651f2ec547ac334034de266479b93af5434f6c1f25e66aba96 android.hardware.neuralnetworks@1.3::types
		e9080d04218e98512b63aace9ff3da52f0130238391f15cbbf7df396a3ec9072 android.hardware.neuralnetworks@1.3::types # b/155508675, b/155662254, b/155238914, b/155660285
		583dc88b41e702e940fd954edda1beb8b4151eab55a5c6d7e69e2781bce84b59 android.hardware.neuralnetworks@1.3::types # b/156918813
		b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio
		fcbb0742a88215ee7a6d7ce0825d253eb2b50391fc6c8c48667f9fd7f6d4549e android.hardware.radio@1.5::IRadioIndication
		b809193970a91ca637a4b0184767315601d32e3ef3d5992ffbc7a8d14a14f015 android.hardware.radio@1.5::IRadioResponse

neuralnetworks/1.3/types.hal

+19 −9

Original line number	Diff line number	Diff line
		@@ -5102,11 +5102,15 @@ enum OperationType : int32_t {
		* The inputs and outputs of the two referenced subgraphs must agree with the
		* signature of this operation. That is, if the operation has (3 + n) inputs
		* and m outputs, both subgraphs must have n inputs and m outputs with the same
		* types as the corresponding operation inputs and outputs.
		* types, ranks, dimensions, scales,
		* zeroPoints, and extraParams as the corresponding operation inputs and
		* outputs.
		* All of the operands mentioned must have fully specified dimensions.
		*
		* Inputs:
		* * 0: A value of type {@link OperandType::TENSOR_BOOL8} and shape [1]
		* that determines which of the two referenced subgraphs to execute.
		* The operand must have fully specified dimensions.
		* * 1: A {@link OperandType::SUBGRAPH} reference to the subgraph to be
		* executed if the condition is true.
		* * 2: A {@link OperandType::SUBGRAPH} reference to the subgraph to be
		@@ -5165,13 +5169,17 @@ enum OperationType : int32_t {
		* Inputs:
		* * 0: A {@link OperandType::SUBGRAPH} reference to the condition
		* subgraph. The subgraph must have (m + k + n) inputs with
		* the same types as the corresponding inputs of the WHILE operation
		* and exactly one output of {@link OperandType::TENSOR_BOOL8}
		* and shape [1].
		* the same types, ranks, dimensions,
		* scales, zeroPoints, and extraParams as the corresponding inputs of
		* the WHILE operation and exactly one output of
		* {@link OperandType::TENSOR_BOOL8} and shape [1].
		* All of the operands mentioned must have fully specified dimensions.
		* * 1: A {@link OperandType::SUBGRAPH} reference to the body subgraph.
		* The subgraph must have (m + k + n) inputs and (m + k) outputs with
		* the same types as the corresponding inputs and outputs of the WHILE
		* operation.
		* the same types, ranks, dimensions,
		* scales, zeroPoints, and extraParams as the corresponding inputs and
		* outputs of the WHILE operation.
		* All of the operands mentioned must have fully specified dimensions.
		* * (m inputs): Initial values for input-output operands.
		* * (k inputs): Initial values for state-only operands.
		* * (n inputs): Values for input-only operands.
		@@ -5491,7 +5499,9 @@ struct Operand {
		* If a tensor operand's dimensions are not fully specified, the
		* dimensions of the operand are deduced from the operand
		* dimensions and values of the operation for which that operand
		* is an output.
		* is an output or from the corresponding {@link OperationType::IF} or
		* {@link OperationType::WHILE} operation input operand dimensions in the
		* case of referenced subgraph input operands.
		*
		* In the following situations, a tensor operand's dimensions must
		* be fully specified:
		@@ -5499,8 +5509,8 @@ struct Operand {
		* . The operand has lifetime CONSTANT_COPY or
		* CONSTANT_REFERENCE.
		*
		* . The operand has lifetime SUBGRAPH_INPUT. Fully
		* specified dimensions must either be present in the
		* . The operand has lifetime SUBGRAPH_INPUT and belongs to the main
		* subgraph. Fully specified dimensions must either be present in the
		* Operand or they must be provided in the corresponding
		* RequestArgument.
		* EXCEPTION: If the input is optional and omitted

neuralnetworks/1.3/types.t

+5 −3

Original line number	Diff line number	Diff line
		@@ -264,7 +264,9 @@ struct Operand {
		* If a tensor operand's dimensions are not fully specified, the
		* dimensions of the operand are deduced from the operand
		* dimensions and values of the operation for which that operand
		* is an output.
		* is an output or from the corresponding {@link OperationType::IF} or
		* {@link OperationType::WHILE} operation input operand dimensions in the
		* case of referenced subgraph input operands.
		*
		* In the following situations, a tensor operand's dimensions must
		* be fully specified:
		@@ -272,8 +274,8 @@ struct Operand {
		* . The operand has lifetime CONSTANT_COPY or
		* CONSTANT_REFERENCE.
		*
		* . The operand has lifetime SUBGRAPH_INPUT. Fully
		* specified dimensions must either be present in the
		* . The operand has lifetime SUBGRAPH_INPUT and belongs to the main
		* subgraph. Fully specified dimensions must either be present in the
		* Operand or they must be provided in the corresponding
		* RequestArgument.
		* EXCEPTION: If the input is optional and omitted

radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp

+13 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <android-base/logging.h>
		#include <radio_hidl_hal_utils_v1_0.h>

		using namespace ::android::hardware::radio::V1_0;
		@@ -22,6 +23,7 @@ using namespace ::android::hardware::radio::V1_0;
		* Test IRadio.setGsmBroadcastConfig() for the response returned.
		*/
		TEST_P(RadioHidlTest, setGsmBroadcastConfig) {
		LOG(DEBUG) << "setGsmBroadcastConfig";
		serial = GetRandomSerialNumber();

		// Create GsmBroadcastSmsConfigInfo #1
		@@ -79,12 +81,14 @@ TEST_P(RadioHidlTest, setGsmBroadcastConfig) {
		RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE},
		CHECK_GENERAL_ERROR));
		}
		LOG(DEBUG) << "setGsmBroadcastConfig finished";
		}

		/*
		* Test IRadio.getGsmBroadcastConfig() for the response returned.
		*/
		TEST_P(RadioHidlTest, getGsmBroadcastConfig) {
		LOG(DEBUG) << "getGsmBroadcastConfig";
		serial = GetRandomSerialNumber();

		radio->getGsmBroadcastConfig(serial);
		@@ -99,12 +103,14 @@ TEST_P(RadioHidlTest, getGsmBroadcastConfig) {
		{RadioError::NONE, RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE},
		CHECK_GENERAL_ERROR));
		}
		LOG(DEBUG) << "getGsmBroadcastConfig finished";
		}

		/*
		* Test IRadio.setCdmaBroadcastConfig() for the response returned.
		*/
		TEST_P(RadioHidlTest, setCdmaBroadcastConfig) {
		LOG(DEBUG) << "setCdmaBroadcastConfig";
		serial = GetRandomSerialNumber();

		CdmaBroadcastSmsConfigInfo cbSmsConfig;
		@@ -126,12 +132,14 @@ TEST_P(RadioHidlTest, setCdmaBroadcastConfig) {
		{RadioError::NONE, RadioError::INVALID_MODEM_STATE},
		CHECK_GENERAL_ERROR));
		}
		LOG(DEBUG) << "setCdmaBroadcastConfig finished";
		}

		/*
		* Test IRadio.getCdmaBroadcastConfig() for the response returned.
		*/
		TEST_P(RadioHidlTest, getCdmaBroadcastConfig) {
		LOG(DEBUG) << "getCdmaBroadcastConfig";
		serial = GetRandomSerialNumber();

		radio->getCdmaBroadcastConfig(serial);
		@@ -144,12 +152,14 @@ TEST_P(RadioHidlTest, getCdmaBroadcastConfig) {
		ASSERT_TRUE(
		CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR));
		}
		LOG(DEBUG) << "getCdmaBroadcastConfig finished";
		}

		/*
		* Test IRadio.setCdmaBroadcastActivation() for the response returned.
		*/
		TEST_P(RadioHidlTest, setCdmaBroadcastActivation) {
		LOG(DEBUG) << "setCdmaBroadcastActivation";
		serial = GetRandomSerialNumber();
		bool activate = false;

		@@ -164,12 +174,14 @@ TEST_P(RadioHidlTest, setCdmaBroadcastActivation) {
		{RadioError::NONE, RadioError::INVALID_ARGUMENTS},
		CHECK_GENERAL_ERROR));
		}
		LOG(DEBUG) << "setCdmaBroadcastActivation finished";
		}

		/*
		* Test IRadio.setGsmBroadcastActivation() for the response returned.
		*/
		TEST_P(RadioHidlTest, setGsmBroadcastActivation) {
		LOG(DEBUG) << "setGsmBroadcastActivation";
		serial = GetRandomSerialNumber();
		bool activate = false;

		@@ -186,4 +198,5 @@ TEST_P(RadioHidlTest, setGsmBroadcastActivation) {
		RadioError::INVALID_STATE, RadioError::OPERATION_NOT_ALLOWED},
		CHECK_GENERAL_ERROR));
		}
		LOG(DEBUG) << "setGsmBroadcastActivation finished";
		}

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+15 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <android-base/logging.h>
		#include <radio_hidl_hal_utils_v1_0.h>

		using namespace ::android::hardware::radio::V1_0;
		@@ -22,6 +23,7 @@ using namespace ::android::hardware::radio::V1_0;
		* Test IRadio.getDataRegistrationState() for the response returned.
		*/
		TEST_P(RadioHidlTest, getDataRegistrationState) {
		LOG(DEBUG) << "getDataRegistrationState";
		serial = GetRandomSerialNumber();

		radio->getDataRegistrationState(serial);
		@@ -94,12 +96,14 @@ TEST_P(RadioHidlTest, getDataRegistrationState) {
		}
		}
		}
		LOG(DEBUG) << "getDataRegistrationState finished";
		}

		/*
		* Test IRadio.setupDataCall() for the response returned.
		*/
		TEST_P(RadioHidlTest, setupDataCall) {
		LOG(DEBUG) << "setupDataCall";
		serial = GetRandomSerialNumber();

		RadioTechnology radioTechnology = RadioTechnology::LTE;
		@@ -142,12 +146,14 @@ TEST_P(RadioHidlTest, setupDataCall) {
		RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT},
		CHECK_OEM_ERROR));
		}
		LOG(DEBUG) << "setupDataCall finished";
		}

		/*
		* Test IRadio.deactivateDataCall() for the response returned.
		*/
		TEST_P(RadioHidlTest, deactivateDataCall) {
		LOG(DEBUG) << "deactivateDataCall";
		serial = GetRandomSerialNumber();
		int cid = 1;
		bool reasonRadioShutDown = false;
		@@ -164,12 +170,14 @@ TEST_P(RadioHidlTest, deactivateDataCall) {
		RadioError::SIM_ABSENT, RadioError::INVALID_CALL_ID},
		CHECK_OEM_ERROR));
		}
		LOG(DEBUG) << "deactivateDataCall finished";
		}

		/*
		* Test IRadio.getDataCallList() for the response returned.
		*/
		TEST_P(RadioHidlTest, getDataCallList) {
		LOG(DEBUG) << "getDataCallList";
		serial = GetRandomSerialNumber();

		radio->getDataCallList(serial);
		@@ -183,12 +191,14 @@ TEST_P(RadioHidlTest, getDataCallList) {
		radioRsp->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}));
		}
		LOG(DEBUG) << "getDataCallList finished";
		}

		/*
		* Test IRadio.setInitialAttachApn() for the response returned.
		*/
		TEST_P(RadioHidlTest, setInitialAttachApn) {
		LOG(DEBUG) << "setInitialAttachApn";
		serial = GetRandomSerialNumber();

		DataProfileInfo dataProfileInfo;
		@@ -226,12 +236,14 @@ TEST_P(RadioHidlTest, setInitialAttachApn) {
		RadioError::SUBSCRIPTION_NOT_AVAILABLE},
		CHECK_OEM_ERROR));
		}
		LOG(DEBUG) << "setInitialAttachApn finished";
		}

		/*
		* Test IRadio.setDataAllowed() for the response returned.
		*/
		TEST_P(RadioHidlTest, setDataAllowed) {
		LOG(DEBUG) << "setDataAllowed";
		serial = GetRandomSerialNumber();
		bool allow = true;

		@@ -244,12 +256,14 @@ TEST_P(RadioHidlTest, setDataAllowed) {
		if (cardStatus.cardState == CardState::ABSENT) {
		EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
		}
		LOG(DEBUG) << "setDataAllowed finished";
		}

		/*
		* Test IRadio.setDataProfile() for the response returned.
		*/
		TEST_P(RadioHidlTest, setDataProfile) {
		LOG(DEBUG) << "setDataProfile";
		serial = GetRandomSerialNumber();

		// Create a dataProfileInfo
		@@ -289,4 +303,5 @@ TEST_P(RadioHidlTest, setDataProfile) {
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED}));
		}
		LOG(DEBUG) << "setDataProfile finished";
		}