Snap for 12903105 from 079229174683d73b81962f4972a272be97260d9a to 25Q2-release (e912b8aa) · Commits · e / os / android_frameworks_av

Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ aidl_interface {
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.btservices",
		"com.android.bt",
		"com.android.media",
		"com.android.media.swcodec",
		],
		@@ -123,7 +123,7 @@ cc_library_headers {
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.btservices",
		"com.android.bt",
		"com.android.media",
		"com.android.media.swcodec",
		],

media/audio/aconfig/Android.bp

+2 −4

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ cc_aconfig_library {
		// TODO(b/316909431) native_bridge_supported: true,
		apex_available: [
		"//apex_available:platform",
		"com.android.btservices",
		"com.android.bt",
		"com.android.media",
		"com.android.media.swcodec",
		],
		@@ -158,9 +158,7 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		min_sdk_version: "Tiramisu",
		mode: "exported",
		apex_available: [
		"com.android.btservices",
		],
		apex_available: ["com.android.bt"],
		visibility: [
		"//packages/modules/Bluetooth:__subpackages__",
		],

media/audioaidlconversion/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ cc_defaults {
		],
		apex_available: [
		"//apex_available:platform",
		"com.android.btservices",
		"com.android.bt",
		"com.android.media",
		"com.android.media.swcodec",
		],

media/libaudioclient/AudioSystem.cpp

+27 −11

Original line number	Diff line number	Diff line
		@@ -155,8 +155,8 @@ public:
		return;
		}
		if (!mService \|\| mService->getDelegate() != service) {
		ALOGW("%s: %s unmatched service death pointers, ignoring",
		__func__, getServiceName());
		ALOGW("%s: %s unmatched service death pointers, previous %p, ignoring",
		__func__, getServiceName(), mService.get());
		return;
		}
		mValid = false;
		@@ -238,9 +238,12 @@ public:
		ALOGW_IF(old != mService,
		"%s: service changed during callback, continuing.", __func__);
		}
		mService = af;
		if (af) {
		ul.unlock();
		if (af) onNewServiceWithAdapter(af);
		onNewServiceWithAdapter(af);
		} else {
		mService = nullptr;
		}
		return OK;
		}

		@@ -270,6 +273,11 @@ private:
		bool reportNoError = false;
		{
		std::lock_guard l(mMutex);
		if (mService == service \|\|
		(mService && service && mService->getDelegate() == service->getDelegate())) {
		ALOGW("%s: %s same service, ignoring", __func__, getServiceName());
		return;
		}
		ALOGW_IF(mValid, "%s: %s service already valid, continuing with initialization",
		__func__, getServiceName());
		if (mClient == nullptr) {
		@@ -1002,6 +1010,10 @@ public:
		sp<AudioSystem::AudioPolicyServiceClient> client;
		{
		std::lock_guard l(mMutex);
		if (aps == mService) {
		ALOGW_IF("%s: %s same service, ignoring", __func__, getServiceName());
		return;
		}
		ALOGW_IF(mValid, "%s: %s service already valid, continuing with initialization",
		__func__, getServiceName());
		if (mClient == nullptr) {
		@@ -1025,12 +1037,13 @@ public:
		{
		std::lock_guard l(mMutex);
		if (!mValid) {
		ALOGW("%s: %s service already invalidated, ignoring", __func__, getServiceName());
		ALOGW("%s: %s service already invalidated, previous %p, ignoring",
		__func__, getServiceName(), mService.get());
		return;
		}
		if (mService != service) {
		ALOGW("%s: %s unmatched service death pointers, ignoring",
		__func__, getServiceName());
		ALOGW("%s: %s unmatched service death pointers, previous %p, ignoring",
		__func__, getServiceName(), mService.get());
		return;
		}
		mValid = false;
		@@ -1108,9 +1121,12 @@ public:
		return OK;
		}
		}
		mService = aps;
		if (aps) {
		ul.unlock();
		if (aps) onNewService(aps);
		onNewService(aps);
		} else {
		mService = nullptr;
		}
		return OK;
		}

media/libaudiopermission/Android.bp

+2 −4

Original line number	Diff line number	Diff line
		@@ -22,10 +22,12 @@ cc_library {
		],

		header_libs: [
		"libaudio_system_headers",
		"libcutils_headers",
		"liberror_headers",
		],
		export_header_lib_headers: [
		"libaudio_system_headers",
		"liberror_headers",
		],
		static_libs: [
		@@ -65,8 +67,6 @@ cc_library {
		tidy_checks: [
		"android-*",
		"bugprone-*",
		"cert-*",
		"clang-analyzer-security*",
		"google-*",
		"misc-*",
		"modernize-*",
		@@ -75,8 +75,6 @@ cc_library {
		tidy_checks_as_errors: [
		"android-*",
		"bugprone-*",
		"cert-*",
		"clang-analyzer-security*",
		"google-*",
		"misc-*",
		"modernize-*",