Merge "media utils: remove flag for Bluetooth address anonymization" into main (4399c5f4) · Commits · e / os / android_frameworks_av

media/utils/ServiceUtilities.cpp

+0 −5

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		#include <media/AidlConversionUtil.h>
		#include <android/content/AttributionSourceState.h>

		#include <com_android_media_audio.h>
		#include <iterator>
		#include <algorithm>
		#include <pwd.h>
		@@ -388,10 +387,6 @@ status_t checkIMemory(const sp<IMemory>& iMemory)
		*/
		bool mustAnonymizeBluetoothAddress(
		const AttributionSourceState& attributionSource, const String16& caller) {
		if (!com::android::media::audio::bluetooth_mac_address_anonymization()) {
		return false;
		}

		uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));
		if (isAudioServerOrSystemServerUid(uid)) {
		return false;