diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-11-24 13:11:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-24 13:11:33 -0800 |
| commit | 1e87fe85a6ea3d17c9f299d2d2b60980362d5cf9 (patch) | |
| tree | af4ba0f6053af2a0c820228bfc85213edb59474a /core/java | |
| parent | a9639b97f47ede69b96c5588e468fdf4dd22ddc8 (diff) | |
| parent | 1c96a00685f48aaa7cbe1ea03b4f031089631e89 (diff) | |
| download | frameworks_base-1e87fe85a6ea3d17c9f299d2d2b60980362d5cf9.zip frameworks_base-1e87fe85a6ea3d17c9f299d2d2b60980362d5cf9.tar.gz frameworks_base-1e87fe85a6ea3d17c9f299d2d2b60980362d5cf9.tar.bz2 | |
Merge "Fix some formatting issues."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDeviceProfileState.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDeviceProfileState.java b/core/java/android/bluetooth/BluetoothDeviceProfileState.java index d1a6ed5..3eadff9 100644 --- a/core/java/android/bluetooth/BluetoothDeviceProfileState.java +++ b/core/java/android/bluetooth/BluetoothDeviceProfileState.java @@ -302,7 +302,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine // Don't auto connect to docks. break; } else { - if (mHeadsetService != null && + if (mHeadsetService != null && mHeadsetService.getPriority(mDevice) == BluetoothHeadset.PRIORITY_AUTO_CONNECT && mHeadsetService.getDevicesMatchingConnectionStates( @@ -1026,7 +1026,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine // This is again against spec. HFP incoming connections should be made // before A2DP, so we should not hit this case. But many devices // don't follow this. - if (mHeadsetService != null && + if (mHeadsetService != null && mHeadsetService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON) { Message msg = new Message(); msg.what = CONNECT_OTHER_PROFILES; |