Merge "InitFlags: Remove pbap_pse_dynamic_attributes" into main (e6b32515) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −7

Original line number	Diff line number	Diff line
		@@ -2080,15 +2080,9 @@ static int getRemotePbapPceVersionNative(JNIEnv* env, jobject /* obj */, jstring
		}

		static jboolean pbapPseDynamicVersionUpgradeIsEnabledNative(JNIEnv* /* env /, jobject / obj */) {
		log::verbose("");

		if (!sBluetoothInterface) {
		return JNI_FALSE;
		}

		return sBluetoothInterface->pbap_pse_dynamic_version_upgrade_is_enabled() ? JNI_TRUE : JNI_FALSE;
		}

		static jint getSocketL2capLocalChannelIdNative(JNIEnv* /* env /, jobject / obj */,
		jlong conn_uuid_lsb, jlong conn_uuid_msb) {
		log::verbose("");

system/btif/src/bluetooth.cc

+1 −4

Original line number	Diff line number	Diff line
		@@ -898,10 +898,7 @@ static int get_remote_pbap_pce_version(const RawAddress* bd_addr) {
		}

		static bool pbap_pse_dynamic_version_upgrade_is_enabled() {
		if (bluetooth::common::init_flags::pbap_pse_dynamic_version_upgrade_is_enabled()) {
		return true;
		}
		log::warn("PBAP PSE dynamic version upgrade is not enabled");
		log::info("PBAP PSE dynamic version upgrade is not enabled");
		return false;
		}

system/btif/src/btif_dm.cc

+0 −6

Original line number	Diff line number	Diff line
		@@ -595,12 +595,6 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr,
		if (com::android::bluetooth::flags::bond_transport_after_bond_cancel_fix()) {
		btif_config_remove_device(bd_addr.ToString());
		}

		if (bluetooth::common::init_flags::pbap_pse_dynamic_version_upgrade_is_enabled()) {
		if (btif_storage_is_pce_version_102(bd_addr)) {
		update_pce_entry_to_interop_database(bd_addr);
		}
		}
		} else if (state == BT_BOND_STATE_BONDED) {
		allocate_metric_id_from_metric_id_allocator(bd_addr);
		if (!save_metric_id_from_metric_id_allocator(bd_addr)) {

system/btif/src/btif_sdp_server.cc

+17 −40

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@
		#include "bta/sys/bta_sys.h"
		#include "btif_common.h"
		#include "btif_sock_sdp.h"
		#include "common/init_flags.h"
		#include "osi/include/allocator.h"
		#include "stack/include/bt_types.h"
		#include "stack/include/bt_uuid16.h"
		@@ -664,27 +663,6 @@ static int add_pbaps_sdp(const bluetooth_sdp_pse_record* rec) {
		status &= get_legacy_stack_sdp_api()->handle.SDP_AddAttribute(
		sdp_handle, (uint16_t)ATTR_ID_SERVICE_NAME, (uint8_t)TEXT_STR_DESC_TYPE,
		(uint32_t)(rec->hdr.service_name_length + 1), (uint8_t*)rec->hdr.service_name);
		if (bluetooth::common::init_flags::pbap_pse_dynamic_version_upgrade_is_enabled()) {
		/*
		PBAP 1.1.1 repositories bits
		Bit 0 = Local Phonebook
		Bit 1 = SIM card
		Bit 2~7 reserved for future use */
		uint8_t supported_repositories_1_1_mask = 0x03;
		uint8_t supported_repositories_1_1 =
		((uint8_t)rec->supported_repositories) & supported_repositories_1_1_mask;
		status &= get_legacy_stack_sdp_api()->handle.SDP_AddProfileDescriptorList(
		sdp_handle, UUID_SERVCLASS_PHONE_ACCESS, 0x0101);

		/* Add supported repositories 1 byte */
		status &= get_legacy_stack_sdp_api()->handle.SDP_AddAttribute(
		sdp_handle, ATTR_ID_SUPPORTED_REPOSITORIES, UINT_DESC_TYPE, (uint32_t)1,
		(uint8_t*)&supported_repositories_1_1);
		log::verbose("supported_repositories_1_1: 0x{:x}", supported_repositories_1_1);
		sdp_save_local_pse_record_attributes(rec->hdr.rfcomm_channel_number, rec->hdr.l2cap_psm,
		rec->hdr.profile_version, rec->supported_features,
		rec->supported_repositories);
		} else {
		/* Add in the Bluetooth Profile Descriptor List */
		status &= get_legacy_stack_sdp_api()->handle.SDP_AddProfileDescriptorList(
		sdp_handle, UUID_SERVCLASS_PHONE_ACCESS, rec->hdr.profile_version);
		@@ -704,7 +682,6 @@ static int add_pbaps_sdp(const bluetooth_sdp_pse_record* rec) {
		UINT16_TO_BE_STREAM(p_temp, rec->hdr.l2cap_psm);
		status &= get_legacy_stack_sdp_api()->handle.SDP_AddAttribute(
		sdp_handle, ATTR_ID_GOEP_L2CAP_PSM, UINT_DESC_TYPE, (uint32_t)2, temp);
		}
		#if 0
		status &= get_legacy_stack_sdp_api()->handle.SDP_AddAttribute(
		sdp_handle, (uint16_t)ATTR_ID_SERVICE_NAME, (uint8_t)TEXT_STR_DESC_TYPE,

system/gd/rust/common/src/init_flags.rs

+0 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,6 @@ init_flags!(
		classic_discovery_only,
		dynamic_avrcp_version_enhancement = true,
		hci_adapter: i32,
		pbap_pse_dynamic_version_upgrade = false,
		redact_log = true,
		sco_codec_timeout_clear,
		sdp_serialization = true,