Merge "Hearing Aid: fix logic in connect and disconnect" into pi-dev (20320107) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+42 −28

Original line number	Diff line number	Diff line
		@@ -211,6 +211,9 @@ public class HearingAidService extends ProfileService {
		if (DBG) {
		Log.d(TAG, "connect(): " + device);
		}
		if (device == null) {
		return false;
		}

		if (getPriority(device) == BluetoothProfile.PRIORITY_OFF) {
		return false;
		@@ -221,16 +224,35 @@ public class HearingAidService extends ProfileService {
		return false;
		}

		long hiSyncId = mDeviceHiSyncIdMap.getOrDefault(device,
		BluetoothHearingAid.HI_SYNC_ID_INVALID);

		if (hiSyncId != mActiveDeviceHiSyncId) {
		for (BluetoothDevice connectedDevice : getConnectedDevices()) {
		disconnect(connectedDevice);
		}
		}

		for (BluetoothDevice storedDevice : mDeviceHiSyncIdMap.keySet()) {
		if (mDeviceHiSyncIdMap.getOrDefault(storedDevice,
		BluetoothHearingAid.HI_SYNC_ID_INVALID) == hiSyncId) {
		synchronized (mStateMachines) {
		HearingAidStateMachine smConnect = getOrCreateStateMachine(device);
		if (smConnect == null) {
		Log.e(TAG, "Cannot connect to " + device + " : no state machine");
		return false;
		HearingAidStateMachine sm = getOrCreateStateMachine(storedDevice);
		if (sm == null) {
		Log.e(TAG, "Ignored connect request for " + device + " : no state machine");
		continue;
		}
		smConnect.sendMessage(HearingAidStateMachine.CONNECT);
		return true;
		sm.sendMessage(HearingAidStateMachine.CONNECT);

		}
		if (hiSyncId == BluetoothHearingAid.HI_SYNC_ID_INVALID
		&& !device.equals(storedDevice)) {
		break;
		}
		}
		}
		return true;
		}

		boolean disconnect(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");
		@@ -242,32 +264,24 @@ public class HearingAidService extends ProfileService {
		}
		long hiSyncId = mDeviceHiSyncIdMap.getOrDefault(device,
		BluetoothHearingAid.HI_SYNC_ID_INVALID);
		synchronized (mStateMachines) {
		HearingAidStateMachine sm = mStateMachines.get(device);
		if (sm == null) {
		Log.e(TAG, "Ignored disconnect request for " + device + " : no state machine");
		} else {
		sm.sendMessage(HearingAidStateMachine.DISCONNECT);
		}
		}
		if (hiSyncId == BluetoothHearingAid.HI_SYNC_ID_INVALID) {
		return true;
		}

		for (BluetoothDevice storedDevice : mDeviceHiSyncIdMap.keySet()) {
		if (mDeviceHiSyncIdMap.getOrDefault(storedDevice,
		BluetoothHearingAid.HI_SYNC_ID_INVALID) != hiSyncId
		\|\| storedDevice.equals(device)) {
		continue;
		}
		BluetoothHearingAid.HI_SYNC_ID_INVALID) == hiSyncId) {
		synchronized (mStateMachines) {
		HearingAidStateMachine sm = mStateMachines.get(storedDevice);
		if (sm == null) {
		Log.e(TAG, "Ignored disconnect request for " + device + " : no state machine");
		Log.e(TAG, "Ignored disconnect request for " + device
		+ " : no state machine");
		continue;
		}
		sm.sendMessage(HearingAidStateMachine.DISCONNECT);
		}
		if (hiSyncId == BluetoothHearingAid.HI_SYNC_ID_INVALID
		&& !device.equals(storedDevice)) {
		break;
		}
		}
		}
		return true;
		}

android/app/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidServiceTest.java

+89 −2

Original line number	Diff line number	Diff line
		@@ -106,8 +106,8 @@ public class HearingAidServiceTest {

		// Get a device for testing
		mLeftDevice = mAdapter.getRemoteDevice("00:01:02:03:04:05");
		mRightDevice = mAdapter.getRemoteDevice("00:01:02:03:04:06");
		mSingleDevice = mAdapter.getRemoteDevice("00:01:02:03:04:00");
		mRightDevice = mAdapter.getRemoteDevice("00:01:02:33:44:55");
		mSingleDevice = mAdapter.getRemoteDevice("10:11:12:13:14:15");
		mService.setPriority(mLeftDevice, BluetoothProfile.PRIORITY_UNDEFINED);
		mService.setPriority(mRightDevice, BluetoothProfile.PRIORITY_UNDEFINED);
		mService.setPriority(mSingleDevice, BluetoothProfile.PRIORITY_UNDEFINED);
		@@ -337,6 +337,93 @@ public class HearingAidServiceTest {
		mService.getConnectionState(mLeftDevice));
		}

		/**
		* Test that the Hearing Aid Service connects to left and right device at the same time.
		*/
		@Test
		public void testConnectAPair_connectBothDevices() {
		HearingAidStackEvent connCompletedEvent;

		// Update the device priority so okToConnect() returns true
		mService.setPriority(mLeftDevice, BluetoothProfile.PRIORITY_ON);
		mService.setPriority(mRightDevice, BluetoothProfile.PRIORITY_ON);
		doReturn(true).when(mNativeInterface).connectHearingAid(any(BluetoothDevice.class));
		doReturn(true).when(mNativeInterface).disconnectHearingAid(any(BluetoothDevice.class));

		// Send a connect request
		Assert.assertTrue("Connect failed", mService.connect(mLeftDevice));

		// Verify the connection state broadcast, and that we are in Connecting state
		verifyConnectionStateIntent(TIMEOUT_MS, mLeftDevice, BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTED);
		Assert.assertEquals(BluetoothProfile.STATE_CONNECTING,
		mService.getConnectionState(mLeftDevice));
		verifyConnectionStateIntent(TIMEOUT_MS, mRightDevice, BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTED);
		Assert.assertEquals(BluetoothProfile.STATE_CONNECTING,
		mService.getConnectionState(mRightDevice));
		}

		/**
		* Test that the service disconnects the current pair before connecting to another pair.
		*/
		@Test
		public void testConnectAnotherPair_disconnectCurrentPair() {
		HearingAidStackEvent connCompletedEvent;

		// Update the device priority so okToConnect() returns true
		mService.setPriority(mLeftDevice, BluetoothProfile.PRIORITY_ON);
		mService.setPriority(mRightDevice, BluetoothProfile.PRIORITY_ON);
		mService.setPriority(mSingleDevice, BluetoothProfile.PRIORITY_ON);
		doReturn(true).when(mNativeInterface).connectHearingAid(any(BluetoothDevice.class));
		doReturn(true).when(mNativeInterface).disconnectHearingAid(any(BluetoothDevice.class));

		// Send a connect request
		Assert.assertTrue("Connect failed", mService.connect(mLeftDevice));

		// Verify the connection state broadcast, and that we are in Connecting state
		verifyConnectionStateIntent(TIMEOUT_MS, mLeftDevice, BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTED);
		verifyConnectionStateIntent(TIMEOUT_MS, mRightDevice, BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTED);


		// Send a message to trigger connection completed
		connCompletedEvent = new HearingAidStackEvent(
		HearingAidStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
		connCompletedEvent.device = mLeftDevice;
		connCompletedEvent.valueInt1 = HearingAidStackEvent.CONNECTION_STATE_CONNECTED;
		mService.messageFromNative(connCompletedEvent);
		connCompletedEvent = new HearingAidStackEvent(
		HearingAidStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
		connCompletedEvent.device = mRightDevice;
		connCompletedEvent.valueInt1 = HearingAidStackEvent.CONNECTION_STATE_CONNECTED;
		mService.messageFromNative(connCompletedEvent);

		// Verify the connection state broadcast, and that we are in Connected state for right side
		verifyConnectionStateIntent(TIMEOUT_MS, mLeftDevice, BluetoothProfile.STATE_CONNECTED,
		BluetoothProfile.STATE_CONNECTING);
		verifyConnectionStateIntent(TIMEOUT_MS, mRightDevice, BluetoothProfile.STATE_CONNECTED,
		BluetoothProfile.STATE_CONNECTING);

		// Send a connect request for another pair
		Assert.assertTrue("Connect failed", mService.connect(mSingleDevice));

		// Verify the connection state broadcast, and that the first pair is in Disconnecting state
		verifyConnectionStateIntent(TIMEOUT_MS, mLeftDevice, BluetoothProfile.STATE_DISCONNECTING,
		BluetoothProfile.STATE_CONNECTED);
		verifyConnectionStateIntent(TIMEOUT_MS, mRightDevice, BluetoothProfile.STATE_DISCONNECTING,
		BluetoothProfile.STATE_CONNECTED);
		Assert.assertFalse(mService.getConnectedDevices().contains(mLeftDevice));
		Assert.assertFalse(mService.getConnectedDevices().contains(mRightDevice));

		// Verify the connection state broadcast, and that the second device is in Connecting state
		verifyConnectionStateIntent(TIMEOUT_MS, mSingleDevice, BluetoothProfile.STATE_CONNECTING,
		BluetoothProfile.STATE_DISCONNECTED);
		Assert.assertEquals(BluetoothProfile.STATE_CONNECTING,
		mService.getConnectionState(mSingleDevice));
		}

		/**
		* Test that the outgoing connect/disconnect and audio switch is successful.
		*/