Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 78128d72: Merge change I2782ac8c into eclair

Browse Source 
Merge commit '78128d721cdff2e035eab5da72819520f88affaf' into eclair-plus-aosp

* commit '78128d721cdff2e035eab5da72819520f88affaf':
  Fix regression.
This commit is contained in:
Nick Pelly
2009-09-30 16:23:53 -07:00
committed by Android Git Automerger
parent 7a51b14d9f 78128d721c
commit 05c776477c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/server/BluetoothA2dpService.java
View File

@@ -333,10 +333,11 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
return false;
}
String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());
if (path == null) {
Integer state = mAudioDevices.get(device);
if (path == null || state == null) {
return false;
}
switch (mAudioDevices.get(device)) {
switch (state.intValue()) {
case BluetoothA2dp.STATE_CONNECTED:
return true;
case BluetoothA2dp.STATE_PLAYING:
@@ -354,10 +355,11 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
return false;
}
String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());
if (path == null) {
Integer state = mAudioDevices.get(device);
if (path == null || state == null) {
return false;
}
switch (mAudioDevices.get(device)) {
switch (state.intValue()) {
case BluetoothA2dp.STATE_PLAYING:
return true;
case BluetoothA2dp.STATE_CONNECTED: