diff options
| author | Danica Chang <danicachang@google.com> | 2010-07-19 13:50:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 13:50:49 -0700 |
| commit | cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed (patch) | |
| tree | ee0235f84a974ad6b4993bbe9ced936ffc93e670 /core/java/android/server | |
| parent | 27dfb3070adc90ddfcc398a352de1741f52add03 (diff) | |
| parent | f23682f128151def4d83d3e2422aea36e0a00061 (diff) | |
| download | frameworks_base-cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed.zip frameworks_base-cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed.tar.gz frameworks_base-cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed.tar.bz2 | |
am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
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 31e5a7b..f00389b 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -919,7 +919,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++) { |