Snap for 12037182 from b7f7055703a77196c1a12556d039f391bd7d5f5d to 24Q4-release (9d6b25da) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/GattService.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -241,12 +241,11 @@ public class GattService extends ProfileService {
		Log.w(TAG, "stop() called before start()");
		return;
		}

		if (Flags.scanManagerRefactor()) {
		setGattService(null);
		}

		} else {
		mTransitionalScanHelper.stop();
		}
		mAdvertiserMap.clear();
		mClientMap.clear();
		if (Flags.gattCleanupRestrictedHandles()) {
		@@ -271,8 +270,10 @@ public class GattService extends ProfileService {
		if (mDistanceMeasurementManager != null) {
		mDistanceMeasurementManager.cleanup();
		}
		if (!Flags.scanManagerRefactor()) {
		mTransitionalScanHelper.cleanup();
		}
		}

		/** This is only used when Flags.scanManagerRefactor() is true. */
		public static synchronized GattService getGattService() {
		@@ -306,7 +307,8 @@ public class GattService extends ProfileService {
		new Handler(getMainLooper()) {
		public void handleMessage(Message msg) {
		synchronized (mTestModeLock) {
		if (!GattService.this.isTestModeEnabled()) {
		if (!GattService.this.isTestModeEnabled()
		\|\| Flags.scanManagerRefactor()) {
		return;
		}
		for (String test : TEST_MODE_BEACONS) {

+10 −0

Original line number	Diff line number	Diff line
		@@ -209,3 +209,13 @@ flag {
		description: "Allocate GATT clients in heap to unlimit the number of clients"
		bug: "348559823"
		}

		flag {
		name: "gatt_fix_multiple_direct_connect"
		namespace: "bluetooth"
		description: "Do not remove device when multiple clients attempt to connect"
		bug: "349232327"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -1106,7 +1106,7 @@ class HearingAidImpl : public HearingAid {
		/// The L2CAP will automatically reconnect the LE-ACL link on
		/// disconnection when there is a pending channel request,
		/// which invalidates all encryption checks performed here.
		com::android::bluetooth::flags::asha_asrc()
		com::android::bluetooth::flags::asha_encrypted_l2c_coc()
		? BTM_SEC_IN_ENCRYPT \| BTM_SEC_OUT_ENCRYPT
		: BTM_SEC_NONE,
		HearingAidImpl::GapCallbackStatic, BT_TRANSPORT_LE);
		@@ -1953,6 +1953,7 @@ class HearingAidImpl : public HearingAid {
		audio_running = false;
		encoder_state_release();
		current_volume = VOLUME_UNKNOWN;
		ResetAsrc();
		}

		void SetVolume(int8_t volume) {