summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2016-03-11 21:23:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-11 21:23:39 +0000
commitebfbfa10d95ef21373cf7c112eac52413b11c525 (patch)
tree8acc61c55d6e769beb3e9c2dc1237da181f4087e /src
parenta03c1f480e61c1f3507e294095e21b73d23a5e58 (diff)
parent3dc68df0b856eace41aaca6bd0266da023c18835 (diff)
Merge "Query lookup uri with work lookup key directly is not allowed" into nyc-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/calllog/ContactInfoHelper.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index a9c7651d9..ff7a3f6a5 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -31,6 +31,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.contacts.common.ContactsUtils;
+import com.android.contacts.common.ContactsUtils.UserType;
import com.android.contacts.common.util.Constants;
import com.android.contacts.common.util.PermissionsUtil;
import com.android.contacts.common.util.PhoneNumberHelper;
@@ -181,7 +182,8 @@ public class ContactInfoHelper {
}
String lookupKey = phoneLookupCursor.getString(PhoneQuery.LOOKUP_KEY);
ContactInfo contactInfo = createPhoneLookupContactInfo(phoneLookupCursor, lookupKey);
- contactInfo.nameAlternative = lookUpDisplayNameAlternative(mContext, lookupKey);
+ contactInfo.nameAlternative = lookUpDisplayNameAlternative(mContext, lookupKey,
+ contactInfo.userType);
return contactInfo;
} finally {
phoneLookupCursor.close();
@@ -207,13 +209,13 @@ public class ContactInfoHelper {
return info;
}
- public static String lookUpDisplayNameAlternative(Context context, String lookupKey) {
- if (lookupKey == null) {
+ public static String lookUpDisplayNameAlternative(Context context, String lookupKey,
+ @UserType long userType) {
+ // Query {@link Contacts#CONTENT_LOOKUP_URI} directly with work lookup key is not allowed.
+ if (lookupKey == null || userType == ContactsUtils.USER_TYPE_WORK) {
return null;
}
-
final Uri uri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey);
-
Cursor cursor = null;
try {
cursor = context.getContentResolver().query(uri,
@@ -222,9 +224,6 @@ public class ContactInfoHelper {
if (cursor != null && cursor.moveToFirst()) {
return cursor.getString(PhoneQuery.NAME_ALTERNATIVE);
}
- } catch (IllegalArgumentException e) {
- // Thrown for work profile queries. For those, we don't support
- // alternative display names.
} finally {
if (cursor != null) {
cursor.close();