Merge "Fix MapClientTest#testConnect" into tm-qpr-dev (d7ffa0a3) · Commits · e / os / android_packages_modules_Bluetooth

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -166,9 +166,6 @@ public class MapClientService extends ProfileService {
		}

		private synchronized void addDeviceToMapAndConnect(BluetoothDevice device) {
		if (Utils.isInstrumentationTestMode()) {
		Log.d(TAG, "addDeviceToMapAndConnect: device=" + device, new Exception());
		}
		// When creating a new statemachine, its state is set to CONNECTING - which will trigger
		// connect.
		MceStateMachine mapStateMachine = new MceStateMachine(this, device);
		@@ -358,6 +355,7 @@ public class MapClientService extends ProfileService {
		}
		stateMachine.doQuit();
		}
		mMapInstanceMap.clear();
		return true;
		}

		@@ -367,10 +365,6 @@ public class MapClientService extends ProfileService {
		Log.d(TAG, "in Cleanup");
		}
		removeUncleanAccounts();
		mMapInstanceMap.clear();
		if (Utils.isInstrumentationTestMode()) {
		Log.d(TAG, "cleanup() called.", new Exception());
		}
		// TODO(b/72948646): should be moved to stop()
		setMapClientService(null);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.bluetooth.BluetoothProfile;
		import android.bluetooth.IBluetoothMapClient;
		import android.content.Context;
		import android.os.UserHandle;
		import android.util.Log;

		import androidx.test.InstrumentationRegistry;
		import androidx.test.filters.MediumTest;
		@@ -123,7 +122,6 @@ public class MapClientTest {

		// is the statemachine created
		Map<BluetoothDevice, MceStateMachine> map = mService.getInstanceMap();
		Log.d("MapClientTest", "map=" + map);

		Assert.assertEquals(1, map.size());
		Assert.assertNotNull(map.get(device));