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

am ca4d4de8: Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken

Browse Source
This commit is contained in:
Jaikumar Ganesh
2010-05-04 15:55:02 -07:00
committed by Android Git Automerger
parent b7e23dbef3 ca4d4de865
commit 1aea42aecc
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,7 +554,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
if (!result) { if (!result) {
if (deviceObjectPath != null) { if (deviceObjectPath != null) {
String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath); String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath);
if (address == null) return;
BluetoothDevice device = mAdapter.getRemoteDevice(address); BluetoothDevice device = mAdapter.getRemoteDevice(address);
int state = getSinkState(device); int state = getSinkState(device);
handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTED); handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTED);

1
core/jni/android_bluetooth_common.cpp
View File

@@ -65,7 +65,6 @@ static Properties adapter_properties[] = {
{"PairableTimeout", DBUS_TYPE_UINT32}, {"PairableTimeout", DBUS_TYPE_UINT32},
{"Discovering", DBUS_TYPE_BOOLEAN}, {"Discovering", DBUS_TYPE_BOOLEAN},
{"Devices", DBUS_TYPE_ARRAY}, {"Devices", DBUS_TYPE_ARRAY},
{"UUIDs", DBUS_TYPE_ARRAY},
}; };
typedef union { typedef union {