diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-05-04 15:53:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-04 15:53:31 -0700 |
| commit | ca4d4de865701bac74d087c47cb6c35ce1946fd9 (patch) | |
| tree | 96b3216e6aa04ac6ecbb88a4036240040706c8ea /core/java/android/server | |
| parent | 37f4f5b1eaa0bbc8909dec80ebf08790d36b7135 (diff) | |
| parent | 9997f66f6288f99e8cdab3201d3b6ad606789efe (diff) | |
| download | frameworks_base-ca4d4de865701bac74d087c47cb6c35ce1946fd9.zip frameworks_base-ca4d4de865701bac74d087c47cb6c35ce1946fd9.tar.gz frameworks_base-ca4d4de865701bac74d087c47cb6c35ce1946fd9.tar.bz2 | |
Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index ac89934..893db2e 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -554,7 +554,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { if (!result) { if (deviceObjectPath != null) { String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath); - if (address == null) return; BluetoothDevice device = mAdapter.getRemoteDevice(address); int state = getSinkState(device); handleSinkStateChange(device, state, BluetoothA2dp.STATE_DISCONNECTED); |