Use enterprise caller-id in incall.

- Use PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI for caller-id.

- Removed a bunch of unused code.

- Renamed fields that will have different semantics.  e.g. contactId now will be
0 and lookupUri null for corp contacts.

- Simplify the sip caller-id lookup.  The regular caller-id lookup can also
do SIP.  The original code (http://ag/70555) was written before CP2 supported
it (http://ag/147367).  This needs QAing.

- Instead of passing around a contact-id to later load a contact picture,
use the picture URI returned from the API.

Bug 15779911

Change-Id: Ia755b9079d03d9236f824c2f1102a6fa902b2097

1 files changed, 2 insertions, 2 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 9d3148a8c..9a233f533 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -271,8 +271,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
                     if (entry.name != null) {
                         Log.d(TAG, "Contact found: " + entry);
                     }
-                    if (entry.personUri != null) {
-                        CallerInfoUtils.sendViewNotification(mContext, entry.personUri);
+                    if (entry.contactUri != null) {
+                        CallerInfoUtils.sendViewNotification(mContext, entry.contactUri);
                     }
                 }