1 files changed, 6 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 4432018f8..d48225c41 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -22,7 +22,6 @@ import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
-import android.telecom.PhoneCapabilities;
 import android.telecom.Phone;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -750,8 +749,10 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
         if (activeCall != null) {
             // TODO: This logic is repeated from CallButtonPresenter.java. We should
             // consolidate this logic.
-            final boolean canMerge = activeCall.can(PhoneCapabilities.MERGE_CONFERENCE);
-            final boolean canSwap = activeCall.can(PhoneCapabilities.SWAP_CONFERENCE);
+            final boolean canMerge = activeCall.can(
+                    android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);
+            final boolean canSwap = activeCall.can(
+                    android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE);
 
             Log.v(this, "activeCall: " + activeCall + ", canMerge: " + canMerge +
                     ", canSwap: " + canSwap);
@@ -773,7 +774,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
         if (heldCall != null) {
             // We have a hold call so presumeable it will always support HOLD...but
             // there is no harm in double checking.
-            final boolean canHold = heldCall.can(PhoneCapabilities.HOLD);
+            final boolean canHold = heldCall.can(android.telecom.Call.Details.CAPABILITY_HOLD);
 
             Log.v(this, "heldCall: " + heldCall + ", canHold: " + canHold);
 
@@ -1168,7 +1169,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
         Call call = CallList.getInstance().getFirstCall();
         TelecomManager tm = getTelecomManager();
 
-        int highlightColor = PhoneAccount.NO_COLOR;
+        int highlightColor = PhoneAccount.NO_HIGHLIGHT_COLOR;
 
         if (call != null && tm != null && tm.hasMultipleCallCapableAccounts()) {
             PhoneAccount account = tm.getPhoneAccount(call.getAccountHandle());