Merge "Clean up correct state machine" into main (8f4ff99a) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/mapclient/MapClientService.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -367,9 +367,10 @@ public class MapClientService extends ProfileService {
		* cleanupDevice removes the associated state machine from the instance map
		*
		* @param device BluetoothDevice address of remote device
		* @param sm the state machine to clean up or null for cleaning up any state machine.
		*/
		@VisibleForTesting
		public void cleanupDevice(BluetoothDevice device) {
		public void cleanupDevice(BluetoothDevice device, MceStateMachine sm) {
		if (DBG) {
		StringBuilder sb = new StringBuilder();
		dump(sb);
		@@ -379,8 +380,12 @@ public class MapClientService extends ProfileService {
		synchronized (mMapInstanceMap) {
		MceStateMachine stateMachine = mMapInstanceMap.get(device);
		if (stateMachine != null) {
		if (sm == null \|\| stateMachine == sm) {
		mMapInstanceMap.remove(device);
		stateMachine.doQuit();
		} else {
		Log.w(TAG, "Trying to clean up wrong state machine");
		}
		}
		}
		if (DBG) {

android/app/src/com/android/bluetooth/mapclient/MceStateMachine.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ class MceStateMachine extends StateMachine {
		@Override
		protected void onQuitting() {
		if (mService != null) {
		mService.cleanupDevice(mDevice);
		mService.cleanupDevice(mDevice, this);
		}
		}

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientServiceTest.java

+26 −2

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ public class MapClientServiceTest {
		doReturn(true, false).when(mAdapterService).isStartedProfile(anyString());
		TestUtils.startService(mServiceRule, MapClientService.class);
		mService = MapClientService.getMapClientService();

		assertThat(mService).isNotNull();
		// Try getting the Bluetooth adapter
		mAdapter = BluetoothAdapter.getDefaultAdapter();
		@@ -237,11 +238,34 @@ public class MapClientServiceTest {
		MceStateMachine sm = mock(MceStateMachine.class);
		mService.getInstanceMap().put(mRemoteDevice, sm);

		mService.cleanupDevice(mRemoteDevice);

		mService.cleanupDevice(mRemoteDevice, sm);
		assertThat(mService.getInstanceMap()).doesNotContainKey(mRemoteDevice);
		}

		@Test
		public void disconnect_doesNotCleanUpNewStateMachineOfSameDevice() {
		int connectionPolicy = BluetoothProfile.CONNECTION_POLICY_ALLOWED;
		when(mDatabaseManager.getProfileConnectionPolicy(
		mRemoteDevice, BluetoothProfile.MAP_CLIENT))
		.thenReturn(connectionPolicy);

		mService.connect(mRemoteDevice);
		MceStateMachine connectedSm = mService.getInstanceMap().get(mRemoteDevice);
		assertThat(connectedSm).isNotNull();

		connectedSm.sendMessage(MceStateMachine.MSG_MAS_SDP_DONE, mock(SdpMasRecord.class));
		connectedSm.sendMessage(MceStateMachine.MSG_MAS_CONNECTED);
		TestUtils.waitForLooperToFinishScheduledTask(connectedSm.getHandler().getLooper());

		mService.disconnect(mRemoteDevice);
		assertThat(mService.getInstanceMap()).containsKey(mRemoteDevice);
		MceStateMachine sm = mock(MceStateMachine.class);
		mService.getInstanceMap().put(mRemoteDevice, sm);
		TestUtils.waitForLooperToFinishScheduledTask(connectedSm.getHandler().getLooper());

		assertThat(mService.getInstanceMap()).containsKey(mRemoteDevice);
		}

		@Test
		public void aclDisconnectedNoTransport_whenConnected_doesNotCallDisconnect() {
		int connectionState = BluetoothProfile.STATE_CONNECTED;

android/app/tests/unit/src/com/android/bluetooth/mapclient/MapClientTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class MapClientTest {
		TestUtils.waitForLooperToFinishScheduledTask(sm.getHandler().getLooper());

		Assert.assertEquals(BluetoothProfile.STATE_CONNECTING, sm.getState());
		mService.cleanupDevice(device);
		mService.cleanupDevice(device, sm);
		Assert.assertNull(mService.getInstanceMap().get(device));
		}