diff options
| author | Staffan Lindvall <staffan.lindvall.x@sonyericsson.com> | 2011-01-07 09:12:06 +0100 |
|---|---|---|
| committer | Johan Redestig <johan.redestig@sonyericsson.com> | 2011-01-07 09:12:06 +0100 |
| commit | 0995f126a9835d63a87d4c2c985a43004978c94d (patch) | |
| tree | b9b3949052de74b9a3ed880292face23df9c691f | |
| parent | 3500d1cc714807945b1427e43eb3bde367849e43 (diff) | |
| download | android_packages_apps_Bluetooth-0995f126a9835d63a87d4c2c985a43004978c94d.tar.gz android_packages_apps_Bluetooth-0995f126a9835d63a87d4c2c985a43004978c94d.tar.bz2 android_packages_apps_Bluetooth-0995f126a9835d63a87d4c2c985a43004978c94d.zip | |
Handle pullVcardListing req without search value for Number attr.
When sending pullVcardListing request to the phone while using
the search attribute "Number" without any search value, the
phone responds with error code "internal error".
Instead the phone should return all numbers in the phonebook.
Change-Id: I7c11b76bbd61882c62be3533b1c45c2c72f497b2
| -rw-r--r-- | src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java index 118403bd4..3c6f38970 100644 --- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java +++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java @@ -234,8 +234,14 @@ public class BluetoothPbapVcardManager { ArrayList<String> nameList = new ArrayList<String>(); Cursor contactCursor = null; - final Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, + Uri uri = null; + + if (phoneNumber != null && phoneNumber.length() == 0) { + uri = Contacts.CONTENT_URI; + } else { + uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(phoneNumber)); + } try { contactCursor = mResolver.query(uri, CONTACTS_PROJECTION, CLAUSE_ONLY_VISIBLE, |