summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumarg@android.com>2011-02-28 15:26:53 -0800
committerAndroid Code Review <code-review@android.com>2011-02-28 15:26:53 -0800
commit72d2f1d8b81087c0a00310ff43e5d060dc8b7867 (patch)
treed3c137c13451091edba3668c34c588af84fb2bc5
parent89a696651197f313786842ec0e2656ea6211bfdc (diff)
parent0995f126a9835d63a87d4c2c985a43004978c94d (diff)
downloadandroid_packages_apps_Bluetooth-72d2f1d8b81087c0a00310ff43e5d060dc8b7867.tar.gz
android_packages_apps_Bluetooth-72d2f1d8b81087c0a00310ff43e5d060dc8b7867.tar.bz2
android_packages_apps_Bluetooth-72d2f1d8b81087c0a00310ff43e5d060dc8b7867.zip
Merge "Handle pullVcardListing req without search value for Number attr."
-rw-r--r--src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java8
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,