Snap for 10147226 from a5f9277262668f5a0242139606a9b33bc8abfa3a to udc-release (0a4b1a8d) · Commits · e / os / android_hardware_interfaces

automotive/audiocontrol/aidl/vts/VtsHalAudioControlTargetTest.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -53,17 +53,25 @@ using namespace android::audio::policy::configuration::V7_0;
		namespace audiohalcommon = android::hardware::audio::common;
		namespace audiomediacommon = android::media::audio::common;

		namespace {
		constexpr int32_t kAidlVersionThree = 3;
		}

		class AudioControlAidl : public testing::TestWithParam<std::string> {
		public:
		virtual void SetUp() override {
		audioControl = android::waitForDeclaredService<IAudioControl>(String16(GetParam().c_str()));
		ASSERT_NE(audioControl, nullptr);
		aidlVersion = audioControl->getInterfaceVersion();
		}

		void TearDown() override { audioControl = nullptr; }

		bool isAidlVersionAtleast(int version) const { return aidlVersion >= version; }

		sp<IAudioControl> audioControl;
		int32_t capabilities;
		int32_t aidlVersion;
		};

		TEST_P(AudioControlAidl, OnSetFadeTowardsFront) {
		@@ -250,6 +258,11 @@ struct ModuleChangeCallbackMock : BnModuleChangeCallback {

		TEST_P(AudioControlAidl, RegisterModuleChangeCallbackTwiceThrowsException) {
		ALOGI("Register Module change callback test");
		if (!isAidlVersionAtleast(kAidlVersionThree)) {
		GTEST_SKIP() << "Device does not support the new APIs for module change callback";
		return;
		}

		// make sure no stale callbacks.
		audioControl->clearModuleChangeCallback();

		@@ -269,6 +282,11 @@ TEST_P(AudioControlAidl, RegisterModuleChangeCallbackTwiceThrowsException) {

		TEST_P(AudioControlAidl, RegisterModuleChangeNullCallbackThrowsException) {
		ALOGI("Register Module change callback with nullptr test");
		if (!isAidlVersionAtleast(kAidlVersionThree)) {
		GTEST_SKIP() << "Device does not support the new APIs for module change callback";
		return;
		}

		auto status = audioControl->setModuleChangeCallback(nullptr);
		EXPECT_THAT(status.exceptionCode(),
		AnyOf(Eq(Status::EX_ILLEGAL_ARGUMENT), Eq(Status::EX_UNSUPPORTED_OPERATION)));

identity/aidl/vts/VtsIWritableIdentityCredentialTests.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -125,7 +125,8 @@ TEST_P(IdentityCredentialTests, verifyAttestationSuccessWithRemoteProvisioning)

		MacedPublicKey macedPublicKey;
		std::vector<uint8_t> attestationKey;
		result = rpc->generateEcdsaP256KeyPair(/testMode=/true, &macedPublicKey, &attestationKey);
		// Start by RPC version 3, we don't support testMode=true. So just verify testMode=false here.
		result = rpc->generateEcdsaP256KeyPair(/testMode=/false, &macedPublicKey, &attestationKey);
		ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage();

		optional<vector<vector<uint8_t>>> remotelyProvisionedCertChain =
		@@ -176,7 +177,8 @@ TEST_P(IdentityCredentialTests, verifyRemotelyProvisionedKeyMayOnlyBeSetOnce) {

		MacedPublicKey macedPublicKey;
		std::vector<uint8_t> attestationKey;
		result = rpc->generateEcdsaP256KeyPair(/testMode=/true, &macedPublicKey, &attestationKey);
		// Start by RPC version 3, we don't support testMode=true. So just verify testMode=false here.
		result = rpc->generateEcdsaP256KeyPair(/testMode=/false, &macedPublicKey, &attestationKey);
		ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage();

		optional<vector<vector<uint8_t>>> remotelyProvisionedCertChain =

tv/input/aidl/android/hardware/tv/input/ITvInputCallback.aidl

+8 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,14 @@ interface ITvInputCallback {
		void notify(in TvInputEvent event);
		/**
		* Notifies the client that an TV message event has occurred. For possible event types,
		* check TvMessageEventType.
		* check {@link android.hardware.tv.input.TvMessageEventType}.
		*
		* The first message in a list of messages contained in a
		* {@link android.hardware.tv.input.TvMessageEvent} should always have a
		* {@link android.hardware.tv.input.TvMessage#subType} of "device_id",
		* otherwise the event is discarded. When the subType of a message is "device_id", the ID of
		* the device that sent the message should be contained in
		* {@link android.hardware.tv.input.TvMessage#groupId}
		*
		* @param event Event passed to the client.
		*/

tv/input/aidl/android/hardware/tv/input/TvMessage.aidl

+10 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,13 @@ parcelable TvMessage {
		*/
		const long NO_GROUP_ID = -1;
		/**
		* Extended data type, like “ATSC A/336 Watermark”, “ATSC_CC”, etc. This is opaque
		* to the framework.
		* Extended data type, like “ATSC A/336 Watermark”, “ATSC_CC”, etc. This type is opaque to the
		* framework except when the subtype is "device_id". If the subtype is "device_id", the ID of
		* device that sent the message should be contained in {@link #groupId}.
		*
		* The first message in a list of messages contained in
		* {@link android.hardware.tv.input.TvMessageEvent} should always have the subtype "device_id",
		* otherwise the event is discarded.
		*/
		String subType;
		/**
		@@ -32,6 +37,9 @@ parcelable TvMessage {
		* headers and bodies of the same event. For messages that do not have a group, this value
		* should be -1.
		*
		* If {@link #subType} is "device_id", this value should contain the ID of the device that sent
		* this message.
		*
		* As -1 is a reserved value, -1 should not be used as a valid groupId.
		*/
		long groupId;