diff options
| author | Danica Chang <danicachang@google.com> | 2010-07-19 13:52:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 13:52:38 -0700 |
| commit | cab94f75aadb9fc3c7b592919765897b7741c63f (patch) | |
| tree | 18ea83a815dafb0830e8e682197842d5ae9292d5 /core/java/android/server | |
| parent | 4a1d035b935abea0a046e6e243520ff367445327 (diff) | |
| parent | cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed (diff) | |
| download | frameworks_base-cab94f75aadb9fc3c7b592919765897b7741c63f.zip frameworks_base-cab94f75aadb9fc3c7b592919765897b7741c63f.tar.gz frameworks_base-cab94f75aadb9fc3c7b592919765897b7741c63f.tar.bz2 | |
am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'
* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Diffstat (limited to 'core/java/android/server')
| -rw-r--r-- | core/java/android/server/BluetoothService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 23219a3..8bee174 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -927,7 +927,7 @@ public class BluetoothService extends IBluetooth.Stub { Log.e(TAG, "Error:Adapter Property at index" + i + "is null"); continue; } - if (name.equals("Devices")) { + if (name.equals("Devices") || name.equals("UUIDs")) { StringBuilder str = new StringBuilder(); len = Integer.valueOf(properties[++i]); for (int j = 0; j < len; j++) { |