Snap for 5688406 from 51fc2ecf50b3588319ab8c712e9954a5027da427 to qt-aml-release
Change-Id: I1331d73073a6558e3dc9040004fca5f25ca4421c
diff --git a/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java b/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java
index fa18045..1d1a635 100644
--- a/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java
+++ b/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java
@@ -103,7 +103,7 @@
boolean mRemoteControlConnected = false;
boolean mBrowsingConnected = false;
- BrowseTree mBrowseTree = null;
+ final BrowseTree mBrowseTree;
private AvrcpPlayer mAddressedPlayer = new AvrcpPlayer();
private int mAddressedPlayerId = -1;
private SparseArray<AvrcpPlayer> mAvailablePlayerList = new SparseArray<AvrcpPlayer>();
@@ -123,6 +123,7 @@
mService = service;
logD(device.toString());
+ mBrowseTree = new BrowseTree(mDevice);
mDisconnected = new Disconnected();
mConnecting = new Connecting();
mConnected = new Connected();
@@ -205,7 +206,6 @@
synchronized void onBrowsingConnected() {
if (mBrowsingConnected) return;
- mBrowseTree = new BrowseTree(mDevice);
mService.sBrowseTree.mRootNode.addChild(mBrowseTree.mRootNode);
BluetoothMediaBrowserService.notifyChanged(mService
.sBrowseTree.mRootNode);
diff --git a/src/com/android/bluetooth/mapclient/MapClientService.java b/src/com/android/bluetooth/mapclient/MapClientService.java
index 9989a98..9467683 100644
--- a/src/com/android/bluetooth/mapclient/MapClientService.java
+++ b/src/com/android/bluetooth/mapclient/MapClientService.java
@@ -295,7 +295,13 @@
setMapClientService(null);
}
- void cleanupDevice(BluetoothDevice device) {
+ /**
+ * cleanupDevice removes the associated state machine from the instance map
+ *
+ * @param device BluetoothDevice address of remote device
+ */
+ @VisibleForTesting
+ public void cleanupDevice(BluetoothDevice device) {
if (DBG) {
StringBuilder sb = new StringBuilder();
dump(sb);
diff --git a/src/com/android/bluetooth/mapclient/MceStateMachine.java b/src/com/android/bluetooth/mapclient/MceStateMachine.java
index 11b634c..0a428b4 100644
--- a/src/com/android/bluetooth/mapclient/MceStateMachine.java
+++ b/src/com/android/bluetooth/mapclient/MceStateMachine.java
@@ -565,6 +565,10 @@
switch (msg.what) {
case MSG_NOTIFICATION:
EventReport ev = (EventReport) msg.obj;
+ if (ev == null) {
+ Log.w(TAG, "MSG_NOTIFICATION event is null");
+ return;
+ }
if (DBG) {
Log.d(TAG, "Message Type = " + ev.getType()
+ ", Message handle = " + ev.getHandle());
diff --git a/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java b/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java
index 05ec98a..70854d8 100644
--- a/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java
+++ b/tests/unit/src/com/android/bluetooth/mapclient/MapClientStateMachineTest.java
@@ -31,10 +31,10 @@
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.MediumTest;
-import androidx.test.filters.Suppress;
import androidx.test.runner.AndroidJUnit4;
import com.android.bluetooth.R;
+import com.android.bluetooth.btservice.ProfileService;
import org.junit.After;
import org.junit.Assert;
@@ -42,33 +42,32 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-@Suppress // TODO: enable when b/74609188 is debugged
@MediumTest
@RunWith(AndroidJUnit4.class)
public class MapClientStateMachineTest {
private static final String TAG = "MapStateMachineTest";
- private static final Integer TIMEOUT = 3000;
+
+ private static final int ASYNC_CALL_TIMEOUT_MILLIS = 100;
private BluetoothAdapter mAdapter;
private MceStateMachine mMceStateMachine = null;
private BluetoothDevice mTestDevice;
private Context mTargetContext;
- private FakeMapClientService mFakeMapClientService;
- private CountDownLatch mConnectedLatch = null;
- private CountDownLatch mDisconnectedLatch = null;
private Handler mHandler;
+ private ArgumentCaptor<Intent> mIntentArgument = ArgumentCaptor.forClass(Intent.class);
+
+ @Mock
+ private MapClientService mMockMapClientService;
+
@Mock
private MasClient mMockMasClient;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -76,16 +75,15 @@
Assume.assumeTrue("Ignore test when MapClientService is not enabled",
mTargetContext.getResources().getBoolean(R.bool.profile_supported_mapmce));
+ doReturn(mTargetContext.getResources()).when(mMockMapClientService).getResources();
+
// This line must be called to make sure relevant objects are initialized properly
mAdapter = BluetoothAdapter.getDefaultAdapter();
// Get a device for testing
mTestDevice = mAdapter.getRemoteDevice("00:01:02:03:04:05");
- mConnectedLatch = new CountDownLatch(1);
- mDisconnectedLatch = new CountDownLatch(1);
- mFakeMapClientService = new FakeMapClientService();
when(mMockMasClient.makeRequest(any(Request.class))).thenReturn(true);
- mMceStateMachine = new MceStateMachine(mFakeMapClientService, mTestDevice, mMockMasClient);
+ mMceStateMachine = new MceStateMachine(mMockMapClientService, mTestDevice, mMockMasClient);
Assert.assertNotNull(mMceStateMachine);
if (Looper.myLooper() == null) {
Looper.prepare();
@@ -121,22 +119,15 @@
Log.i(TAG, "in testStateTransitionFromConnectingToDisconnected");
setupSdpRecordReceipt();
Message msg = Message.obtain(mHandler, MceStateMachine.MSG_MAS_DISCONNECTED);
- mMceStateMachine.getCurrentState().processMessage(msg);
+ mMceStateMachine.sendMessage(msg);
// Wait until the message is processed and a broadcast request is sent to
// to MapClientService to change
// state from STATE_CONNECTING to STATE_DISCONNECTED
- boolean result = false;
- try {
- result = mDisconnectedLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // Test that the latch reached zero; i.e., that a broadcast of state-change was received.
- Assert.assertTrue(result);
- // When the state reaches STATE_DISCONNECTED, MceStateMachine object is in the process of
- // being dismantled; i.e., can't rely on getting its current state. That means can't
- // test its current state = STATE_DISCONNECTED.
+ verify(mMockMapClientService,
+ timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(2)).sendBroadcast(
+ mIntentArgument.capture(), eq(ProfileService.BLUETOOTH_PERM));
+ Assert.assertEquals(BluetoothProfile.STATE_DISCONNECTED, mMceStateMachine.getState());
}
/**
@@ -148,45 +139,51 @@
setupSdpRecordReceipt();
Message msg = Message.obtain(mHandler, MceStateMachine.MSG_MAS_CONNECTED);
- mMceStateMachine.getCurrentState().processMessage(msg);
+ mMceStateMachine.sendMessage(msg);
// Wait until the message is processed and a broadcast request is sent to
// to MapClientService to change
// state from STATE_CONNECTING to STATE_CONNECTED
- boolean result = false;
- try {
- result = mConnectedLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // Test that the latch reached zero; i.e., that a broadcast of state-change was received.
- Assert.assertTrue(result);
+ verify(mMockMapClientService,
+ timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(2)).sendBroadcast(
+ mIntentArgument.capture(), eq(ProfileService.BLUETOOTH_PERM));
+ Assert.assertEquals(BluetoothProfile.STATE_CONNECTED, mMceStateMachine.getState());
+ }
+
+ /**
+ * Test receiving an empty event report
+ */
+ @Test
+ public void testReceiveEmptyEvent() {
+ setupSdpRecordReceipt();
+ Message msg = Message.obtain(mHandler, MceStateMachine.MSG_MAS_CONNECTED);
+ mMceStateMachine.sendMessage(msg);
+
+ // Wait until the message is processed and a broadcast request is sent to
+ // to MapClientService to change
+ // state from STATE_CONNECTING to STATE_CONNECTED
+ verify(mMockMapClientService,
+ timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(2)).sendBroadcast(
+ mIntentArgument.capture(), eq(ProfileService.BLUETOOTH_PERM));
+ Assert.assertEquals(BluetoothProfile.STATE_CONNECTED, mMceStateMachine.getState());
+
+ // Send an empty notification event, verify the mMceStateMachine is still connected
+ Message notification = Message.obtain(mHandler, MceStateMachine.MSG_NOTIFICATION);
+ mMceStateMachine.getCurrentState().processMessage(msg);
Assert.assertEquals(BluetoothProfile.STATE_CONNECTED, mMceStateMachine.getState());
}
private void setupSdpRecordReceipt() {
+ // Perform first part of MAP connection logic.
+ verify(mMockMapClientService,
+ timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(1)).sendBroadcast(
+ mIntentArgument.capture(), eq(ProfileService.BLUETOOTH_PERM));
+ Assert.assertEquals(BluetoothProfile.STATE_CONNECTING, mMceStateMachine.getState());
+
// Setup receipt of SDP record
- SdpMasRecord record = new SdpMasRecord(1, 1, 1, 1, 1, 1, "blah");
+ SdpMasRecord record = new SdpMasRecord(1, 1, 1, 1, 1, 1, "MasRecord");
Message msg = Message.obtain(mHandler, MceStateMachine.MSG_MAS_SDP_DONE, record);
- mMceStateMachine.getCurrentState().processMessage(msg);
+ mMceStateMachine.sendMessage(msg);
}
- private class FakeMapClientService extends MapClientService {
- @Override
- void cleanupDevice(BluetoothDevice device) {}
- @Override
- public void sendBroadcast(Intent intent, String receiverPermission) {
- int prevState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, -1);
- int state = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1);
- Log.i(TAG, "received broadcast: prevState = " + prevState
- + ", state = " + state);
- if (prevState == BluetoothProfile.STATE_CONNECTING
- && state == BluetoothProfile.STATE_CONNECTED) {
- mConnectedLatch.countDown();
- } else if (prevState == BluetoothProfile.STATE_CONNECTING
- && state == BluetoothProfile.STATE_DISCONNECTED) {
- mDisconnectedLatch.countDown();
- }
- }
- }
}
