Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82aacdde authored by Eric Rowe's avatar Eric Rowe Committed by Android Git Automerger
Browse files

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

Merge commit 'f8d2acdc' into gingerbread-plus-aosp

* commit 'f8d2acdc':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
parents 2e99245e f8d2acdc

core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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() {