Merge changes I5b8ad5ca,I0011019c,I8ee43ce8,I35e0748a,I9e9947ad, ...

* changes:
  Show clear frequents option in the toolbar if there are suggested contacts.
  Use UI listener for preferred account worker in in call UI
  Make SIM Selection hint multi-line
  Convert CequintCallerIdContact into an @AutoValue
  Newly starred SpeedDialUiItems now have SpeedDialEntry ids set.
  Disable entries in CallingAccountSelector that are not selectable
  Add "enabled" to SelectPhoneAccountDialogFragment.
  Add skeleton for CequintPhoneLookup
  Log send button impressions for RTT call.
  Show international call on wifi dialog without InCallActivity.
  Expose active calls from in call UI

1 files changed, 6 insertions, 6 deletions

diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index 165ec13bf..eefd4833c 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -522,20 +522,20 @@ public class ContactInfoCache implements OnImageLoadCompleteListener {
     }
     boolean hasUpdate = false;
 
-    if (TextUtils.isEmpty(callerInfo.name) && !TextUtils.isEmpty(cequintCallerIdContact.name)) {
-      callerInfo.name = cequintCallerIdContact.name;
+    if (TextUtils.isEmpty(callerInfo.name) && !TextUtils.isEmpty(cequintCallerIdContact.name())) {
+      callerInfo.name = cequintCallerIdContact.name();
       hasUpdate = true;
     }
-    if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) {
-      callerInfo.geoDescription = cequintCallerIdContact.geoDescription;
+    if (!TextUtils.isEmpty(cequintCallerIdContact.geolocation())) {
+      callerInfo.geoDescription = cequintCallerIdContact.geolocation();
       callerInfo.shouldShowGeoDescription = true;
       hasUpdate = true;
     }
     // Don't overwrite photo in local contacts.
     if (!callerInfo.contactExists
         && callerInfo.contactDisplayPhotoUri == null
-        && cequintCallerIdContact.imageUrl != null) {
-      callerInfo.contactDisplayPhotoUri = Uri.parse(cequintCallerIdContact.imageUrl);
+        && cequintCallerIdContact.photoUri() != null) {
+      callerInfo.contactDisplayPhotoUri = Uri.parse(cequintCallerIdContact.photoUri());
       hasUpdate = true;
     }
     // Set contact to exist to avoid phone number service lookup.