Snap for 12058995 from f889fd15523272be0b531c1fcdc8c34e65c2e142 to 24Q4-release (b37730d5) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -4106,6 +4106,13 @@ public class LeAudioService extends ProfileService {
		if (mCsipSetCoordinatorService != null) {
		mCsipSetCoordinatorService.setConnectionPolicy(device, connectionPolicy);
		}

		if (mBassClientService == null) {
		mBassClientService = mServiceFactory.getBassClientService();
		}
		if (mBassClientService != null && mBassClientService.isEnabled()) {
		mBassClientService.setConnectionPolicy(device, connectionPolicy);
		}
		}

		/**

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import android.media.BluetoothProfileConnectionInfo;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.ParcelUuid;
		import android.sysprop.BluetoothProperties;
		import android.platform.test.flag.junit.SetFlagsRule;

		import androidx.test.filters.MediumTest;
		@@ -1167,6 +1168,7 @@ public class LeAudioServiceTest {
		/** Test setting connection policy */
		@Test
		public void testSetConnectionPolicy() {
		mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_BROADCAST_FEATURE_SUPPORT);
		doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));
		doReturn(true).when(mNativeInterface).disconnectLeAudio(any(BluetoothDevice.class));
		doReturn(true)
		@@ -1175,6 +1177,7 @@ public class LeAudioServiceTest {
		when(mVolumeControlService.setConnectionPolicy(any(), anyInt())).thenReturn(true);
		when(mCsipSetCoordinatorService.setConnectionPolicy(any(), anyInt())).thenReturn(true);
		when(mHapClientService.setConnectionPolicy(any(), anyInt())).thenReturn(true);
		when(mBassClientService.setConnectionPolicy(any(), anyInt())).thenReturn(true);
		when(mDatabaseManager.getProfileConnectionPolicy(mSingleDevice, BluetoothProfile.LE_AUDIO))
		.thenReturn(BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

		@@ -1190,7 +1193,10 @@ public class LeAudioServiceTest {
		.setConnectionPolicy(mSingleDevice, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
		verify(mHapClientService, times(1))
		.setConnectionPolicy(mSingleDevice, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

		if (BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false)) {
		verify(mBassClientService, times(1))
		.setConnectionPolicy(mSingleDevice, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
		}
		// Verify the connection state broadcast, and that we are in Connecting state
		verifyConnectionStateIntent(
		TIMEOUT_MS,
		@@ -1230,7 +1236,11 @@ public class LeAudioServiceTest {
		.setConnectionPolicy(mSingleDevice, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
		verify(mHapClientService, times(1))
		.setConnectionPolicy(mSingleDevice, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);

		if (BluetoothProperties.isProfileBapBroadcastAssistEnabled().orElse(false)) {
		verify(mBassClientService, times(1))
		.setConnectionPolicy(
		mSingleDevice, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
		}
		// Verify the connection state broadcast, and that we are in Connecting state
		verifyConnectionStateIntent(
		TIMEOUT_MS,

flags/security.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,16 @@ flag {
		bug: "333634398"
		}

		flag {
		name: "split_sec_state"
		namespace: "bluetooth"
		description: "Splic sec_state into separate link specific variables"
		bug: "351136926"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "key_missing_as_ordered_broadcast"
		namespace: "bluetooth"