Revert "Telecom API updates (3/6)"

This reverts commit dfa54cf281ebe1ec7ea63254812a479b4efb8c04.

Change-Id: Id1a83bab7c666c94c2ce0dfb590da2a775f7c797

9 files changed, 68 insertions, 70 deletions

diff --git a/src/com/android/incallui/AnswerPresenter.java b/src/com/android/incallui/AnswerPresenter.java
index ebe997c3..6dbdd694 100644
--- a/src/com/android/incallui/AnswerPresenter.java
+++ b/src/com/android/incallui/AnswerPresenter.java
@@ -16,6 +16,8 @@
 
 package com.android.incallui;
 
+import android.telecom.PhoneCapabilities;
+import android.app.KeyguardManager;
 import android.content.Context;
 import android.os.SystemProperties;
 import android.telecom.VideoProfile;
@@ -343,9 +345,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
         final Context context = getUi().getContext();
 
         mHasTextMessages = textMsgs != null;
-        boolean withSms =
-                call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT)
-                && mHasTextMessages;
+        boolean withSms = call.can(PhoneCapabilities.RESPOND_VIA_TEXT) && mHasTextMessages;
         if (call.isVideoCall(context)) {
             if (withSms) {
                 getUi().showTargets(AnswerFragment.TARGET_SET_FOR_VIDEO_WITH_SMS);
@@ -382,7 +382,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
                     call.getId());
             getUi().showAnswerUi(true);
 
-            boolean withSms = call.can(android.telecom.Call.Details.CAPABILITY_RESPOND_VIA_TEXT) && textMsgs != null;
+            boolean withSms = call.can(PhoneCapabilities.RESPOND_VIA_TEXT) && textMsgs != null;
             if (call.isVideoCall(getUi().getContext())) {
                 if (withSms) {
                     getUi().showTargets(AnswerFragment.TARGET_SET_FOR_VIDEO_WITH_SMS);
diff --git a/src/com/android/incallui/AudioModeProvider.java b/src/com/android/incallui/AudioModeProvider.java
index c823fda3..de22ccb0 100644
--- a/src/com/android/incallui/AudioModeProvider.java
+++ b/src/com/android/incallui/AudioModeProvider.java
@@ -40,8 +40,8 @@ import java.util.List;
     private Phone.Listener mPhoneListener = new Phone.Listener() {
         @Override
         public void onAudioStateChanged(Phone phone, AudioState audioState) {
-            onAudioModeChange(audioState.getRoute(), audioState.isMuted());
-            onSupportedAudioModeChange(audioState.getSupportedRouteMask());
+            onAudioModeChange(audioState.route, audioState.isMuted);
+            onSupportedAudioModeChange(audioState.supportedRouteMask);
         }
     };
 
diff --git a/src/com/android/incallui/Call.java b/src/com/android/incallui/Call.java
index 00348ff8..70a223e2 100644
--- a/src/com/android/incallui/Call.java
+++ b/src/com/android/incallui/Call.java
@@ -24,6 +24,7 @@ import android.hardware.camera2.CameraCharacteristics;
 import android.net.Uri;
 import android.telecom.CallProperties;
 import android.telecom.DisconnectCause;
+import android.telecom.PhoneCapabilities;
 import android.telecom.GatewayInfo;
 import android.telecom.InCallService.VideoCall;
 import android.telecom.PhoneAccountHandle;
@@ -386,7 +387,7 @@ public final class Call {
     public boolean can(int capabilities) {
         int supportedCapabilities = mTelecommCall.getDetails().getCallCapabilities();
 
-        if ((capabilities & android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE) != 0) {
+        if ((capabilities & PhoneCapabilities.MERGE_CONFERENCE) != 0) {
             // We allow you to merge if the capabilities allow it or if it is a call with
             // conferenceable calls.
             if (CallList.getInstance().isDsdaEnabled()) {
@@ -406,18 +407,16 @@ public final class Call {
                     }
                 }
                 if (!hasConfenceableCall &&
-                        ((android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE
-                          & supportedCapabilities) == 0)) {
+                        ((PhoneCapabilities.MERGE_CONFERENCE & supportedCapabilities) == 0)) {
                     // Cannot merge calls if there are no calls to merge with.
                     return false;
                 }
             } else if (mTelecommCall.getConferenceableCalls().isEmpty() &&
-                    ((android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE
-                      & supportedCapabilities) == 0)) {
+                    ((PhoneCapabilities.MERGE_CONFERENCE & supportedCapabilities) == 0)) {
                 // Cannot merge calls if there are no calls to merge with.
                 return false;
             }
-            capabilities &= ~android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE;
+            capabilities &= ~PhoneCapabilities.MERGE_CONFERENCE;
         }
         return (capabilities == (capabilities & mTelecommCall.getDetails().getCallCapabilities()));
     }
@@ -565,8 +564,7 @@ public final class Call {
                                 + "VideoSettings:%s]",
                 mId,
                 State.toString(getState()),
-                android.telecom.Call.Details
-                        .capabilitiesToString(mTelecommCall.getDetails().getCallCapabilities()),
+                PhoneCapabilities.toString(mTelecommCall.getDetails().getCallCapabilities()),
                 mChildCallIds,
                 getParentId(),
                 mTelecommCall.getDetails().getVideoState(), mIsActiveSub,
diff --git a/src/com/android/incallui/CallButtonPresenter.java b/src/com/android/incallui/CallButtonPresenter.java
index 8a1c750a..06aaa7ca 100644
--- a/src/com/android/incallui/CallButtonPresenter.java
+++ b/src/com/android/incallui/CallButtonPresenter.java
@@ -20,6 +20,7 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.telecom.AudioState;
 import android.telecom.InCallService.VideoCall;
+import android.telecom.PhoneCapabilities;
 import android.telecom.VideoProfile;
 
 import com.android.incallui.AudioModeProvider.AudioModeListener;
@@ -350,7 +351,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
 
         updateCallButtons(call, ui.getContext());
 
-        ui.enableMute(call.can(android.telecom.Call.Details.CAPABILITY_MUTE));
+        ui.enableMute(call.can(PhoneCapabilities.MUTE));
     }
 
     private static int toInteger(boolean b) {
@@ -394,38 +395,34 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         ui.showAudioButton(true);
         ui.showDialpadButton(true);
 
-        Log.v(this, "Show hold ", call.can(android.telecom.Call.Details.CAPABILITY_SUPPORT_HOLD));
-        Log.v(this, "Enable hold", call.can(android.telecom.Call.Details.CAPABILITY_HOLD));
-        Log.v(this, "Show merge ", call.can(
-                android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE));
-        Log.v(this, "Show swap ", call.can(
-                android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE));
+        Log.v(this, "Show hold ", call.can(PhoneCapabilities.SUPPORT_HOLD));
+        Log.v(this, "Enable hold", call.can(PhoneCapabilities.HOLD));
+        Log.v(this, "Show merge ", call.can(PhoneCapabilities.MERGE_CONFERENCE));
+        Log.v(this, "Show swap ", call.can(PhoneCapabilities.SWAP_CONFERENCE));
         Log.v(this, "Show add call ", TelecomAdapter.getInstance().canAddCall());
-        Log.v(this, "Show mute ", call.can(android.telecom.Call.Details.CAPABILITY_MUTE));
-        Log.v(this, "Show video call local:", call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL)
-                + " remote: " + call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE));
+        Log.v(this, "Show mute ", call.can(PhoneCapabilities.MUTE));
+        Log.v(this, "Show video call local:", call.can(PhoneCapabilities.SUPPORTS_VT_LOCAL)
+                + " remote: " + call.can(PhoneCapabilities.SUPPORTS_VT_REMOTE));
 
         final boolean canAdd = TelecomAdapter.getInstance().canAddCall();
-        final boolean enableHoldOption = call.can(android.telecom.Call.Details.CAPABILITY_HOLD);
-        final boolean supportHold = call.can(android.telecom.Call.Details.CAPABILITY_SUPPORT_HOLD);
+        final boolean enableHoldOption = call.can(PhoneCapabilities.HOLD);
+        final boolean supportHold = call.can(PhoneCapabilities.SUPPORT_HOLD);
 
-        boolean canVideoCall = call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL)
-                && call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE)
-                && call.can(android.telecom.Call.Details.CAPABILITY_CALL_TYPE_MODIFIABLE);
+        boolean canVideoCall = call.can(PhoneCapabilities.SUPPORTS_VT_LOCAL)
+                && call.can(PhoneCapabilities.SUPPORTS_VT_REMOTE)
+                && call.can(PhoneCapabilities.CALL_TYPE_MODIFIABLE);
         ui.showChangeToVideoButton(canVideoCall);
 
-        final boolean showMergeOption = call.can(
-                android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);
+        final boolean showMergeOption = call.can(PhoneCapabilities.MERGE_CONFERENCE);
         final boolean showAddCallOption = canAdd;
-        final boolean showAddParticipantOption = call.can(android.telecom.Call.Details.CAPABILITY_ADD_PARTICIPANT);
+        final boolean showAddParticipantOption = call.can(PhoneCapabilities.ADD_PARTICIPANT);
         final boolean showManageVideoCallConferenceOption = call.can(
-            android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE) && CallUtils.isVideoCall(call);
+            PhoneCapabilities.MANAGE_CONFERENCE) && CallUtils.isVideoCall(call);
 
         // Show either HOLD or SWAP, but not both. If neither HOLD or SWAP is available:
         //     (1) If the device normally can hold, show HOLD in a disabled state.
         //     (2) If the device doesn't have the concept of hold/swap, remove the button.
-        final boolean showSwapOption = call.can(
-                android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE);
+        final boolean showSwapOption = call.can(PhoneCapabilities.SWAP_CONFERENCE);
         final boolean showHoldOption = !showSwapOption && (enableHoldOption || supportHold);
 
         ui.setHold(call.getState() == Call.State.ONHOLD);
@@ -438,7 +435,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto
         buttonCount += toInteger(showAddParticipantOption);
         buttonCount += toInteger(showHoldOption);
         buttonCount += toInteger(showSwapOption);
-        buttonCount += toInteger(call.can(android.telecom.Call.Details.CAPABILITY_MUTE));
+        buttonCount += toInteger(call.can(PhoneCapabilities.MUTE));
         buttonCount += toInteger(showManageVideoCallConferenceOption);
 
         Log.v(this, "show AddParticipant: " + showAddParticipantOption +
diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java
index 256ea04d..10f0042c 100644
--- a/src/com/android/incallui/CallCardPresenter.java
+++ b/src/com/android/incallui/CallCardPresenter.java
@@ -25,6 +25,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.telecom.DisconnectCause;
+import android.telecom.PhoneCapabilities;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.StatusHints;
@@ -266,10 +267,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
     public void onDetailsChanged(Call call, android.telecom.Call.Details details) {
         updatePrimaryCallState();
 
-        if (call.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE) !=
-                android.telecom.Call.Details.can(
-                        details.getCallCapabilities(),
-                        android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE)) {
+        if (call.can(PhoneCapabilities.MANAGE_CONFERENCE) != PhoneCapabilities.can(
+                details.getCallCapabilities(), PhoneCapabilities.MANAGE_CONFERENCE)) {
             maybeShowManageConferenceCallButton();
         }
     }
@@ -321,8 +320,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             return false;
         }
 
-        return mPrimary.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE)
-            && !mPrimary.isVideoCall(mContext);
+        return mPrimary.can(PhoneCapabilities.MANAGE_CONFERENCE) && !mPrimary.isVideoCall(mContext);
     }
 
     private void setCallbackNumber() {
@@ -723,8 +721,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
     }
 
     private String getConferenceString(Call call) {
-        boolean isGenericConference = call.can(
-                android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE);
+        boolean isGenericConference = call.can(PhoneCapabilities.GENERIC_CONFERENCE);
         Log.v(this, "getConferenceString: " + isGenericConference);
 
         final int resId = isGenericConference
@@ -733,8 +730,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
     }
 
     private Drawable getConferencePhoto(Call call) {
-        boolean isGenericConference = call.can(
-                android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE);
+        boolean isGenericConference = call.can(PhoneCapabilities.GENERIC_CONFERENCE);
         Log.v(this, "getConferencePhoto: " + isGenericConference);
 
         final int resId = isGenericConference
diff --git a/src/com/android/incallui/ConferenceManagerPresenter.java b/src/com/android/incallui/ConferenceManagerPresenter.java
index c61b1017..7acd94e3 100644
--- a/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -17,7 +17,11 @@
 package com.android.incallui;
 
 import android.content.Context;
+import android.net.Uri;
+import android.telecom.PhoneCapabilities;
+import android.text.TextUtils;
 
+import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
 import com.android.incallui.InCallPresenter.InCallState;
 import com.android.incallui.InCallPresenter.InCallStateListener;
@@ -72,20 +76,18 @@ public class ConferenceManagerPresenter
 
     @Override
     public void onDetailsChanged(Call call, android.telecom.Call.Details details) {
-        boolean canDisconnect = details.can(
-                android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE);
-        boolean canSeparate = details.can(
-                android.telecom.Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE);
-
-        if (call.can(android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE)
-                != canDisconnect
-            || call.can(android.telecom.Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE)
-                != canSeparate) {
+        boolean canDisconnect = PhoneCapabilities.can(
+                details.getCallCapabilities(), PhoneCapabilities.DISCONNECT_FROM_CONFERENCE);
+        boolean canSeparate = PhoneCapabilities.can(
+                details.getCallCapabilities(), PhoneCapabilities.SEPARATE_FROM_CONFERENCE);
+
+        if (call.can(PhoneCapabilities.DISCONNECT_FROM_CONFERENCE) != canDisconnect
+                || call.can(PhoneCapabilities.SEPARATE_FROM_CONFERENCE) != canSeparate) {
             getUi().refreshCall(call);
         }
 
-        if (!details.can(
-                android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE)) {
+        if (!PhoneCapabilities.can(
+                details.getCallCapabilities(), PhoneCapabilities.MANAGE_CONFERENCE)) {
             getUi().setVisible(false);
         }
     }
diff --git a/src/com/android/incallui/ConferenceParticipantListAdapter.java b/src/com/android/incallui/ConferenceParticipantListAdapter.java
index 0d597721..641261e0 100644
--- a/src/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/src/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -18,6 +18,7 @@ package com.android.incallui;
 
 import android.content.Context;
 import android.net.Uri;
+import android.telecom.PhoneCapabilities;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,6 +42,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Adapter for a ListView containing conference call participant information.
@@ -334,10 +336,11 @@ public class ConferenceParticipantListAdapter extends BaseAdapter {
                     new ContactLookupCallback(this));
         }
 
-        boolean thisRowCanSeparate = mParentCanSeparate && call.getTelecommCall().getDetails().can(
-                android.telecom.Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE);
-        boolean thisRowCanDisconnect = call.getTelecommCall().getDetails().can(
-                android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE);
+        int callCapabilities = call.getTelecommCall().getDetails().getCallCapabilities();
+        boolean thisRowCanSeparate = mParentCanSeparate && PhoneCapabilities.can(
+                callCapabilities, PhoneCapabilities.SEPARATE_FROM_CONFERENCE);
+        boolean thisRowCanDisconnect = PhoneCapabilities.can(
+                callCapabilities, PhoneCapabilities.DISCONNECT_FROM_CONFERENCE);
 
         setCallerInfoForRow(result, contactCache.name, contactCache.number, contactCache.label,
                 contactCache.lookupKey, contactCache.displayPhotoUri, thisRowCanSeparate,
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index 92414c27..600b0a45 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -23,6 +23,7 @@ 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;
@@ -779,10 +780,8 @@ 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(
-                    android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);
-            final boolean canSwap = activeCall.can(
-                    android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE);
+            final boolean canMerge = activeCall.can(PhoneCapabilities.MERGE_CONFERENCE);
+            final boolean canSwap = activeCall.can(PhoneCapabilities.SWAP_CONFERENCE);
 
             Log.v(this, "activeCall: " + activeCall + ", canMerge: " + canMerge +
                     ", canSwap: " + canSwap);
@@ -804,7 +803,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(android.telecom.Call.Details.CAPABILITY_HOLD);
+            final boolean canHold = heldCall.can(PhoneCapabilities.HOLD);
 
             Log.v(this, "heldCall: " + heldCall + ", canHold: " + canHold);
 
@@ -1262,6 +1261,7 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
                 View.LAYOUT_DIRECTION_RTL;
     }
 
+
     /**
      * @return An instance of TelecomManager.
      */
diff --git a/src/com/android/incallui/TelecomAdapter.java b/src/com/android/incallui/TelecomAdapter.java
index c9c80d57..a64efcdc 100644
--- a/src/com/android/incallui/TelecomAdapter.java
+++ b/src/com/android/incallui/TelecomAdapter.java
@@ -24,6 +24,8 @@ import android.telecom.InCallAdapter;
 import android.telecom.Phone;
 import android.telecom.PhoneAccountHandle;
 
+import android.telecom.PhoneCapabilities;
+
 import com.google.common.base.Preconditions;
 
 import java.util.List;
@@ -179,8 +181,8 @@ final class TelecomAdapter implements InCallPhoneListener {
             if (!conferenceable.isEmpty()) {
                 call.conference(conferenceable.get(0));
             } else {
-                if (call.getDetails().can(
-                        android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE)) {
+                int capabilities = call.getDetails().getCallCapabilities();
+                if (0 != (capabilities & PhoneCapabilities.MERGE_CONFERENCE)) {
                     call.mergeConference();
                 }
             }
@@ -192,8 +194,8 @@ final class TelecomAdapter implements InCallPhoneListener {
     void swap(String callId) {
         if (mPhone != null) {
             android.telecom.Call call = getTelecommCallById(callId);
-            if (call.getDetails().can(
-                    android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE)) {
+            int capabilities = call.getDetails().getCallCapabilities();
+            if (0 != (capabilities & PhoneCapabilities.SWAP_CONFERENCE)) {
                 call.swapConference();
             }
         } else {