diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-06-07 14:09:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-07 14:09:49 -0700 |
| commit | a8c2514eddd39eb1d486d7bfa616178c45f2adea (patch) | |
| tree | c7d737b379983a930a20af150bc5a2247191636f /media/java | |
| parent | e50ab5f94c61d6884d7544c982f471661c2fbe32 (diff) | |
| parent | 740e39be6af3e366a4b82c030b5ea67ab144b42a (diff) | |
| download | frameworks_base-a8c2514eddd39eb1d486d7bfa616178c45f2adea.zip frameworks_base-a8c2514eddd39eb1d486d7bfa616178c45f2adea.tar.gz frameworks_base-a8c2514eddd39eb1d486d7bfa616178c45f2adea.tar.bz2 | |
Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioService.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 5c278d9..bd78f93 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1092,16 +1092,20 @@ public class AudioService extends IAudioService.Stub { private BluetoothHeadset.ServiceListener mBluetoothHeadsetServiceListener = new BluetoothHeadset.ServiceListener() { public void onServiceConnected() { - if (mBluetoothHeadset != null && - mBluetoothHeadset.getState() == BluetoothHeadset.STATE_CONNECTED) { - mBluetoothHeadsetConnected = true; + if (mBluetoothHeadset != null) { + BluetoothDevice device = mBluetoothHeadset.getCurrentHeadset(); + if (mBluetoothHeadset.getState(device) == BluetoothHeadset.STATE_CONNECTED) { + mBluetoothHeadsetConnected = true; + } } } public void onServiceDisconnected() { - if (mBluetoothHeadset != null && - mBluetoothHeadset.getState() == BluetoothHeadset.STATE_DISCONNECTED) { - mBluetoothHeadsetConnected = false; - clearAllScoClients(); + if (mBluetoothHeadset != null) { + BluetoothDevice device = mBluetoothHeadset.getCurrentHeadset(); + if (mBluetoothHeadset.getState(device) == BluetoothHeadset.STATE_DISCONNECTED) { + mBluetoothHeadsetConnected = false; + clearAllScoClients(); + } } } }; |