drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6fe795ec: Do another contact lookup if the first one fails and...

Browse Source 
Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
  Do another contact lookup if the first one fails and...
This commit is contained in:
Hung-ying Tyan
2010-10-20 13:57:20 -07:00
committed by Android Git Automerger
parent fd0ba81c02 6fe795ecd3
commit d691b36cde
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@ -260,6 +260,7 @@ public class CallerInfo {
Uri contactUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
CallerInfo info = getCallerInfo(context, contactUri);
info = doSecondaryLookupIfNecessary(context, number, info);
// if no query results were returned with a viable number,
// fill in the original number value we used to query with.
@ -270,6 +271,30 @@ public class CallerInfo {
return info;
}
/**
* Performs another lookup if previous lookup fails and it's a SIP call
* and the peer's username is all numeric. Look up the username as it
* could be a PSTN number in the contact database.
*
* @param context the query context
* @param number the original phone number, could be a SIP URI
* @param previousResult the result of previous lookup
* @return previousResult if it's not the case
*/
static CallerInfo doSecondaryLookupIfNecessary(Context context,
String number, CallerInfo previousResult) {
if (!previousResult.contactExists
&& PhoneNumberUtils.isUriNumber(number)) {
String username = number.substring(0, number.indexOf('@'));
if (PhoneNumberUtils.isGlobalPhoneNumber(username)) {
previousResult = getCallerInfo(context,
Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI,
Uri.encode(username)));
}
}
return previousResult;
}
/**
* getCallerId: a convenience method to get the caller id for a given
* number.
@ -402,6 +427,7 @@ public class CallerInfo {
.append("\nisCachedPhotoCurrent: " + isCachedPhotoCurrent)
.append("\nemergency: " + mIsEmergency)
.append("\nvoicemail " + mIsVoiceMail)
.append("\ncontactExists " + contactExists)
.toString();
}
}

8
telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
View File

@ -230,6 +230,14 @@ public class CallerInfoAsyncQuery {
mCallerInfo = CallerInfo.getCallerInfo(mQueryContext, mQueryUri, cursor);
if (DBG) Log.d(LOG_TAG, "==> Got mCallerInfo: " + mCallerInfo);
CallerInfo newCallerInfo = CallerInfo.doSecondaryLookupIfNecessary(
mQueryContext, cw.number, mCallerInfo);
if (newCallerInfo != mCallerInfo) {
mCallerInfo = newCallerInfo;
if (DBG) log("#####async contact look up with numeric username"
+ mCallerInfo);
}
// Use the number entered by the user for display.
if (!TextUtils.isEmpty(cw.number)) {
mCallerInfo.phoneNumber = PhoneNumberUtils.formatNumber(cw.number);