Snap for 12118079 from 9622edf286a1904f94395837d15b9339870c972c to 24Q4-release (a9f6a11e) · Commits · e / os / android_packages_modules_Bluetooth

flags/pairing.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -84,3 +84,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "wait_for_disconnect_before_unbond"
		namespace: "bluetooth"
		description: "Disconnect all links before removing the bond"
		bug: "345299969"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -237,13 +237,20 @@ public interface BluetoothProfile {
		*/
		int BATTERY = 30;

		/**
		* Gaming Audio Profile
		*
		* @hide
		*/
		int GMAP = 31;

		/**
		* Max profile ID. This value should be updated whenever a new profile is added to match the
		* largest value assigned to a profile.
		*
		* @hide
		*/
		int MAX_PROFILE_ID = 30;
		int MAX_PROFILE_ID = 31;

		/**
		* Default priority for devices that we try to auto-connect to and allow incoming connections

+9 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,15 @@ public final class BluetoothUuid {
		public static final ParcelUuid GENERIC_MEDIA_CONTROL =
		ParcelUuid.fromString("00001849-0000-1000-8000-00805F9B34FB");

		/**
		* UUID corresponding to the Gaming Audio Profile (GMAP).
		*
		* @hide
		*/
		@NonNull
		public static final ParcelUuid GMAP =
		ParcelUuid.fromString("00001858-0000-1000-8000-00805F9B34FB");

		/**
		* UUID corresponding to the Media Control Service.
		*

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		#include "internal_include/bt_target.h"
		#include "stack/include/bt_hdr.h"
		#include "stack/include/btm_api_types.h"
		#include "stack/include/sdp_status.h"
		#include "stack/sdp/sdp_discovery_db.h"
		#include "types/raw_address.h"

		@@ -171,7 +172,7 @@ typedef struct {

		/* data type for BTA_AG_DISC_RESULT_EVT */
		typedef struct {
		uint16_t status;
		tSDP_STATUS status;
		} tBTA_AG_DISC_RESULT;

		/* data type for RFCOMM events */

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ const tBTA_AG_SDP_CBACK bta_ag_sdp_cback_tbl[] = {bta_ag_sdp_cback_1, bta_ag_sdp
		* Returns void
		*
		******************************************************************************/
		static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) {
		static void bta_ag_sdp_cback(tSDP_STATUS status, uint8_t idx) {
		log::verbose("status:0x{:x}", status);
		tBTA_AG_SCB* p_scb = bta_ag_scb_by_idx(idx);
		if (p_scb) {