resolved conflicts for merge of fc22ba88 to master

Change-Id: I686eff26a8172fe289866046f3b0a3f2392628c2

1 files changed, 14 insertions, 17 deletions

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 2ce1ac6bd..23941bafb 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -35,7 +35,6 @@ import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
 import com.android.incallui.InCallApp.NotificationBroadcastReceiver;
 import com.android.incallui.InCallPresenter.InCallState;
-import com.android.services.telephony.common.Call;
 
 /**
  * This class adds Notifications to the status bar for the in-call experience.
@@ -225,24 +224,22 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         // This callback will always get called immediately and synchronously with whatever data
         // it has available, and may make a subsequent call later (same thread) if it had to
         // call into the contacts provider for more data.
-        mContactInfoCache.findInfo(call.getIdentification(), isIncoming,
-                new ContactInfoCacheCallback() {
-
-                    @Override
-                    public void onContactInfoComplete(int callId, ContactCacheEntry entry) {
-                        Call call = CallList.getInstance().getCall(callId);
-                        if (call != null) {
-                            buildAndSendNotification(call, entry);
-                        }
+        mContactInfoCache.findInfo(call, isIncoming, new ContactInfoCacheCallback() {
+                @Override
+                public void onContactInfoComplete(int callId, ContactCacheEntry entry) {
+                    Call call = CallList.getInstance().getCall(callId);
+                    if (call != null) {
+                        buildAndSendNotification(call, entry);
                     }
+                }
 
-                    @Override
-                    public void onImageLoadComplete(int callId, ContactCacheEntry entry) {
-                        Call call = CallList.getInstance().getCall(callId);
-                        if (call != null) {
-                            buildAndSendNotification(call, entry);
-                        }
-                    } });
+                @Override
+                public void onImageLoadComplete(int callId, ContactCacheEntry entry) {
+                    Call call = CallList.getInstance().getCall(callId);
+                    if (call != null) {
+                        buildAndSendNotification(call, entry);
+                    }
+                } });
     }
 
     /**