am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread

Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp

* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
This commit is contained in:
Eric Rowe
2010-10-07 09:19:37 -07:00
committed by Android Git Automerger

View File

@@ -133,14 +133,12 @@ public class BluetoothTestUtils extends Assert {
private class HeadsetServiceListener implements ServiceListener { private class HeadsetServiceListener implements ServiceListener {
private boolean mConnected = false; private boolean mConnected = false;
@Override
public void onServiceConnected() { public void onServiceConnected() {
synchronized (this) { synchronized (this) {
mConnected = true; mConnected = true;
} }
} }
@Override
public void onServiceDisconnected() { public void onServiceDisconnected() {
synchronized (this) { synchronized (this) {
mConnected = false; mConnected = false;
@@ -321,6 +319,9 @@ public class BluetoothTestUtils extends Assert {
filter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED); filter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
mContext.registerReceiver(mReceiver, filter); mContext.registerReceiver(mReceiver, filter);
mA2dp = new BluetoothA2dp(mContext);
mHeadset = new BluetoothHeadset(mContext, mHeadsetServiceListener);
} }
public void close() { public void close() {