diff options
| author | 2011-10-26 16:19:13 -0700 | |
|---|---|---|
| committer | 2011-10-26 16:19:13 -0700 | |
| commit | 01d24784a5ddece8bb7c5d088bf93c99faa0dc7e (patch) | |
| tree | 2e55be68716028257b89efebaf21c4632405c6fc | |
| parent | d24b020e5e6911591f3535815ef9f86b0d57f65c (diff) | |
| parent | 6ae591217591e7f3e7de20b71f89d2ee9c8dc8bb (diff) | |
Merge "Fix auto connection of headset profile." into ics-mr0
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDeviceProfileState.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDeviceProfileState.java b/core/java/android/bluetooth/BluetoothDeviceProfileState.java index 48d0203b06fe..7addd4a56d18 100644 --- a/core/java/android/bluetooth/BluetoothDeviceProfileState.java +++ b/core/java/android/bluetooth/BluetoothDeviceProfileState.java @@ -110,6 +110,7 @@ public final class BluetoothDeviceProfileState extends StateMachine { private BluetoothHeadset mHeadsetService; private BluetoothPbap mPbapService; private boolean mPbapServiceConnected; + private boolean mAutoConnectionPending; private static final String BLUETOOTH_ADMIN_PERM = android.Manifest.permission.BLUETOOTH_ADMIN; private BluetoothDevice mDevice; @@ -272,6 +273,10 @@ public final class BluetoothDeviceProfileState extends StateMachine { public void onServiceConnected(int profile, BluetoothProfile proxy) { synchronized(BluetoothDeviceProfileState.this) { mHeadsetService = (BluetoothHeadset) proxy; + if (mAutoConnectionPending) { + sendMessage(AUTO_CONNECT_PROFILES); + mAutoConnectionPending = false; + } } } public void onServiceDisconnected(int profile) { @@ -360,8 +365,9 @@ public final class BluetoothDeviceProfileState extends StateMachine { // Don't auto connect to docks. break; } else { - if (mHeadsetService != null && - mHeadsetService.getPriority(mDevice) == + if (mHeadsetService == null) { + mAutoConnectionPending = true; + } else if (mHeadsetService.getPriority(mDevice) == BluetoothHeadset.PRIORITY_AUTO_CONNECT && mHeadsetService.getDevicesMatchingConnectionStates( new int[] {BluetoothProfile.STATE_CONNECTED, |