Merge "Drop codec configuration changes for disconnected devices" into main (690e8157) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -636,6 +636,13 @@ public class A2dpSinkService extends ProfileService {
		return;
		}
		A2dpSinkStateMachine stateMachine = getStateMachineForDevice(device);
		if (stateMachine == null) {
		Log.w(
		TAG,
		"Received audio config changed event for an unconnected device, device="
		+ device);
		return;
		}
		stateMachine.onStackEvent(event);
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -295,6 +295,26 @@ public class A2dpSinkServiceTest {
		assertThat(config).isEqualTo(expected);
		}

		/** Make sure we ignore audio configuration changes for disconnected/unknown devices */
		@Test
		public void testOnAudioConfigChanged_withNullDevice_eventDropped() {
		StackEvent audioConfigChanged =
		StackEvent.audioConfigChanged(null, TEST_SAMPLE_RATE, TEST_CHANNEL_COUNT);
		mService.messageFromNative(audioConfigChanged);
		assertThat(mService.getAudioConfig(null)).isNull();
		}

		/** Make sure we ignore audio configuration changes for disconnected/unknown devices */
		@Test
		public void testOnAudioConfigChanged_withUnknownDevice_eventDropped() {
		assertThat(mService.getConnectionState(mDevice1))
		.isEqualTo(BluetoothProfile.STATE_DISCONNECTED);
		StackEvent audioConfigChanged =
		StackEvent.audioConfigChanged(mDevice1, TEST_SAMPLE_RATE, TEST_CHANNEL_COUNT);
		mService.messageFromNative(audioConfigChanged);
		assertThat(mService.getAudioConfig(mDevice1)).isNull();
		}

		/**
		* Getting an audio config for a device that hasn't received one yet should return null
		*/