InCallUI - Use String IDs

Change-Id: Ibacb79658c146466d4f23bfcf7af0ebfb6e84dd0

1 files changed, 5 insertions, 5 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 598e69af5..272c6c12f 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -246,7 +246,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         }
 
         // otherwise compare call Ids
-        return call1.getCallId() == call2.getCallId();
+        return call1.getCallId().equals(call2.getCallId());
     }
 
     private void maybeStartSearch(Call call, boolean isPrimary) {
@@ -265,7 +265,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
 
         cache.findInfo(call, isIncoming, new ContactInfoCacheCallback() {
                 @Override
-                public void onContactInfoComplete(int callId, ContactCacheEntry entry) {
+                public void onContactInfoComplete(String callId, ContactCacheEntry entry) {
                     updateContactEntry(entry, isPrimary, false);
                     if (entry.name != null) {
                         Log.d(TAG, "Contact found: " + entry);
@@ -276,14 +276,14 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
                 }
 
                 @Override
-                public void onImageLoadComplete(int callId, ContactCacheEntry entry) {
+                public void onImageLoadComplete(String callId, ContactCacheEntry entry) {
                     if (getUi() == null) {
                         return;
                     }
                     if (entry.photo != null) {
-                        if (mPrimary != null && callId == mPrimary.getCallId()) {
+                        if (mPrimary != null && callId.equals(mPrimary.getCallId())) {
                             getUi().setPrimaryImage(entry.photo);
-                        } else if (mSecondary != null && callId == mSecondary.getCallId()) {
+                        } else if (mSecondary != null && callId.equals(mSecondary.getCallId())) {
                             getUi().setSecondaryImage(entry.photo);
                         }
                     }