Merge "Ensure AAudioStreamBuilder handles null strings" into sc-dev (20c22430) · Commits · e / os / android_frameworks_av

media/libaaudio/src/core/AAudioAudio.cpp

+12 −4

Original line number	Diff line number	Diff line
		@@ -91,16 +91,24 @@ AAUDIO_API void AAudioStreamBuilder_setPackageName(AAudioStreamBuilder* builder,
		const char* packageName)
		{
		AudioStreamBuilder *streamBuilder = convertAAudioBuilderToStreamBuilder(builder);
		// Only system apps can read the op package name. For regular apps the regular package name
		// is a sufficient replacement
		streamBuilder->setOpPackageName(packageName);
		std::optional<std::string> optionalPackageName;
		if (packageName != nullptr) {
		optionalPackageName = std::string(packageName);
		}
		// Only system apps can read the op package name. For regular apps the
		// regular package name is a sufficient replacement
		streamBuilder->setOpPackageName(optionalPackageName);
		}

		AAUDIO_API void AAudioStreamBuilder_setAttributionTag(AAudioStreamBuilder* builder,
		const char* attributionTag)
		{
		AudioStreamBuilder *streamBuilder = convertAAudioBuilderToStreamBuilder(builder);
		streamBuilder->setAttributionTag(attributionTag);
		std::optional<std::string> optionalAttrTag;
		if (attributionTag != nullptr) {
		optionalAttrTag = std::string(attributionTag);
		}
		streamBuilder->setAttributionTag(optionalAttrTag);
		}

		AAUDIO_API void AAudioStreamBuilder_setSampleRate(AAudioStreamBuilder* builder,

+2 −2

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ public:
		}

		// TODO b/182392769: reexamine if Identity can be used
		void setOpPackageName(const std::string opPackageName) {
		void setOpPackageName(const std::optional<std::string> opPackageName) {
		mOpPackageName = opPackageName;
		}

		@@ -149,7 +149,7 @@ public:
		return mAttributionTag;
		}

		void setAttributionTag(const std::string attributionTag) {
		void setAttributionTag(const std::optional<std::string> attributionTag) {
		mAttributionTag = attributionTag;
		}