am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and... (fbd21b58) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/CallerInfo.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,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.
		@@ -277,6 +278,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.
		@@ -409,6 +434,7 @@ public class CallerInfo {
		.append("\nisCachedPhotoCurrent: " + isCachedPhotoCurrent)
		.append("\nemergency: " + mIsEmergency)
		.append("\nvoicemail " + mIsVoiceMail)
		.append("\ncontactExists " + contactExists)
		.toString();
		}
		}

telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,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)) {
		CountryDetector detector = (CountryDetector) mQueryContext.getSystemService(