diff options
author | Eric Rowe <erowe@google.com> | 2010-10-07 09:19:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 09:19:37 -0700 |
commit | 82aacddef99e5cfc399d02702f2a336af8fbd59f (patch) | |
tree | 92a7890c04de0ead344034348087d4d0face44f0 /core/tests/coretests | |
parent | 2e99245e0e0d64ba6ab9227154c7fad132559c01 (diff) | |
parent | f8d2acdc57fd747278bb909c9e15b959e07d63b6 (diff) | |
download | frameworks_base-82aacddef99e5cfc399d02702f2a336af8fbd59f.zip frameworks_base-82aacddef99e5cfc399d02702f2a336af8fbd59f.tar.gz frameworks_base-82aacddef99e5cfc399d02702f2a336af8fbd59f.tar.bz2 |
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
Diffstat (limited to 'core/tests/coretests')
-rw-r--r-- | core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java b/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java index e9311e0..2d0424d 100644 --- a/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java +++ b/core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java @@ -133,14 +133,12 @@ public class BluetoothTestUtils extends Assert { private class HeadsetServiceListener implements ServiceListener { private boolean mConnected = false; - @Override public void onServiceConnected() { synchronized (this) { mConnected = true; } } - @Override public void onServiceDisconnected() { synchronized (this) { mConnected = false; @@ -321,6 +319,9 @@ public class BluetoothTestUtils extends Assert { filter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED); filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); mContext.registerReceiver(mReceiver, filter); + + mA2dp = new BluetoothA2dp(mContext); + mHeadset = new BluetoothHeadset(mContext, mHeadsetServiceListener); } public void close() { |