Snap for 10146593 from 1266c86ea656071d940f597e33c44378f1b8deac to udc-qpr1-release (5297e803) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/Config.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -47,10 +47,14 @@ ndk::ScopedAStatus Config::getEngineConfig(AudioHalEngineConfig* _aidl_return) {
		LOG(WARNING) << __func__ << mAudioPolicyConverter.getError();
		}
		}
		// Logging full contents of the config is an overkill, just provide statistics.
		LOG(DEBUG) << "getEngineConfig: number of strategies parsed: "
		<< engConfig.productStrategies.size()
		<< ", default strategy: " << engConfig.defaultProductStrategyId
		<< ", number of volume groups parsed: " << engConfig.volumeGroups.size();
		return engConfig;
		}();
		*_aidl_return = returnEngCfg;
		LOG(DEBUG) << __func__ << ": returning " << _aidl_return->toString();
		return ndk::ScopedAStatus::ok();
		}
		} // namespace aidl::android::hardware::audio::core

+6 −2

Original line number	Diff line number	Diff line
		@@ -81,6 +81,8 @@ static AudioPortExt createDeviceExt(AudioDeviceType devType, int32_t flags,
		deviceExt.device.address = "bottom";
		} else if (devType == AudioDeviceType::IN_MICROPHONE_BACK && connection.empty()) {
		deviceExt.device.address = "back";
		} else if (devType == AudioDeviceType::IN_SUBMIX \|\| devType == AudioDeviceType::OUT_SUBMIX) {
		deviceExt.device.address = "0";
		}
		deviceExt.device.type.connection = std::move(connection);
		deviceExt.flags = flags;
		@@ -365,8 +367,10 @@ std::unique_ptr<Configuration> getRSubmixConfiguration() {

		// Device ports

		AudioPort rsubmixOutDevice = createPort(c.nextPortId++, "Remote Submix Out", 0, false,
		createDeviceExt(AudioDeviceType::OUT_SUBMIX, 0));
		AudioPort rsubmixOutDevice =
		createPort(c.nextPortId++, "Remote Submix Out", 0, false,
		createDeviceExt(AudioDeviceType::OUT_SUBMIX, 0,
		AudioDeviceDescription::CONNECTION_VIRTUAL));
		rsubmixOutDevice.profiles.push_back(
		createProfile(PcmType::INT_24_BIT, {AudioChannelLayout::LAYOUT_STEREO}, {48000}));
		c.ports.push_back(rsubmixOutDevice);

+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 =

+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.
		*/

+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;