Merge "Rename Telecomm to Telecom"

12 files changed, 104 insertions, 104 deletions

diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java
index f08653e65..932e712b4 100644
--- a/InCallUI/src/com/android/incallui/Call.java
+++ b/InCallUI/src/com/android/incallui/Call.java
@@ -59,7 +59,7 @@ public class Call {
         public static final int DISCONNECTED = 10;  /* State after a call disconnects */
         public static final int CONFERENCED = 11;   /* Call part of a conference call */
         public static final int SELECT_PHONE_ACCOUNT = 12; /* Waiting for account selection */
-        public static final int CONNECTING = 13;    /* Waiting for Telecomm broadcast to finish */
+        public static final int CONNECTING = 13;    /* Waiting for Telecom broadcast to finish */
 
 
         public static boolean isConnectingOrConnected(int state) {
@@ -180,7 +180,7 @@ public class Call {
             new android.telecom.Call.Callback() {
                 @Override
                 public void onStateChanged(android.telecom.Call call, int newState) {
-                    Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " newState="
+                    Log.d(this, "TelecomCallCallback onStateChanged call=" + call + " newState="
                             + newState);
                     update();
                 }
@@ -188,7 +188,7 @@ public class Call {
                 @Override
                 public void onParentChanged(android.telecom.Call call,
                         android.telecom.Call newParent) {
-                    Log.d(this, "TelecommCallCallback onParentChanged call=" + call + " newParent="
+                    Log.d(this, "TelecomCallCallback onParentChanged call=" + call + " newParent="
                             + newParent);
                     update();
                 }
@@ -202,7 +202,7 @@ public class Call {
                 @Override
                 public void onDetailsChanged(android.telecom.Call call,
                         android.telecom.Call.Details details) {
-                    Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " details="
+                    Log.d(this, "TelecomCallCallback onStateChanged call=" + call + " details="
                             + details);
                     update();
                 }
@@ -210,7 +210,7 @@ public class Call {
                 @Override
                 public void onCannedTextResponsesLoaded(android.telecom.Call call,
                         List<String> cannedTextResponses) {
-                    Log.d(this, "TelecommCallCallback onStateChanged call=" + call
+                    Log.d(this, "TelecomCallCallback onStateChanged call=" + call
                             + " cannedTextResponses=" + cannedTextResponses);
                     update();
                 }
@@ -218,7 +218,7 @@ public class Call {
                 @Override
                 public void onPostDialWait(android.telecom.Call call,
                         String remainingPostDialSequence) {
-                    Log.d(this, "TelecommCallCallback onStateChanged call=" + call
+                    Log.d(this, "TelecomCallCallback onStateChanged call=" + call
                             + " remainingPostDialSequence=" + remainingPostDialSequence);
                     update();
                 }
@@ -226,14 +226,14 @@ public class Call {
                 @Override
                 public void onVideoCallChanged(android.telecom.Call call,
                         VideoCall videoCall) {
-                    Log.d(this, "TelecommCallCallback onStateChanged call=" + call + " videoCall="
+                    Log.d(this, "TelecomCallCallback onStateChanged call=" + call + " videoCall="
                             + videoCall);
                     update();
                 }
 
                 @Override
                 public void onCallDestroyed(android.telecom.Call call) {
-                    Log.d(this, "TelecommCallCallback onStateChanged call=" + call);
+                    Log.d(this, "TelecomCallCallback onStateChanged call=" + call);
                     call.unregisterCallback(mTelecomCallCallback);
                 }
 
@@ -244,7 +244,7 @@ public class Call {
                 }
             };
 
-    private android.telecom.Call mTelecommCall;
+    private android.telecom.Call mTelecomCall;
     private boolean mIsEmergencyCall;
     private Uri mHandle;
     private final String mId;
@@ -268,21 +268,21 @@ public class Call {
      */
     @NeededForTesting
     Call(int state) {
-        mTelecommCall = null;
+        mTelecomCall = null;
         mId = ID_PREFIX + Integer.toString(sIdCounter++);
         setState(state);
     }
 
-    public Call(android.telecom.Call telecommCall) {
-        mTelecommCall = telecommCall;
+    public Call(android.telecom.Call telecomCall) {
+        mTelecomCall = telecomCall;
         mId = ID_PREFIX + Integer.toString(sIdCounter++);
 
-        updateFromTelecommCall();
-        mTelecommCall.registerCallback(mTelecomCallCallback);
+        updateFromTelecomCall();
+        mTelecomCall.registerCallback(mTelecomCallCallback);
     }
 
-    public android.telecom.Call getTelecommCall() {
-        return mTelecommCall;
+    public android.telecom.Call getTelecomCall() {
+        return mTelecomCall;
     }
 
     /**
@@ -296,7 +296,7 @@ public class Call {
     private void update() {
         Trace.beginSection("Update");
         int oldState = getState();
-        updateFromTelecommCall();
+        updateFromTelecomCall();
         if (oldState != getState() && getState() == Call.State.DISCONNECTED) {
             CallList.getInstance().onDisconnect(this);
         } else {
@@ -305,26 +305,26 @@ public class Call {
         Trace.endSection();
     }
 
-    private void updateFromTelecommCall() {
-        Log.d(this, "updateFromTelecommCall: " + mTelecommCall.toString());
-        setState(translateState(mTelecommCall.getState()));
-        setDisconnectCause(mTelecommCall.getDetails().getDisconnectCause());
+    private void updateFromTelecomCall() {
+        Log.d(this, "updateFromTelecomCall: " + mTelecomCall.toString());
+        setState(translateState(mTelecomCall.getState()));
+        setDisconnectCause(mTelecomCall.getDetails().getDisconnectCause());
 
-        if (mTelecommCall.getVideoCall() != null) {
+        if (mTelecomCall.getVideoCall() != null) {
             if (mVideoCallCallback == null) {
                 mVideoCallCallback = new InCallVideoCallCallback(this);
             }
-            mTelecommCall.getVideoCall().registerCallback(mVideoCallCallback);
+            mTelecomCall.getVideoCall().registerCallback(mVideoCallCallback);
         }
 
         mChildCallIds.clear();
-        for (int i = 0; i < mTelecommCall.getChildren().size(); i++) {
+        for (int i = 0; i < mTelecomCall.getChildren().size(); i++) {
             mChildCallIds.add(
-                    CallList.getInstance().getCallByTelecommCall(
-                            mTelecommCall.getChildren().get(i)).getId());
+                    CallList.getInstance().getCallByTelecomCall(
+                            mTelecomCall.getChildren().get(i)).getId());
         }
 
-        Bundle callExtras = mTelecommCall.getDetails().getExtras();
+        Bundle callExtras = mTelecomCall.getDetails().getExtras();
         if (callExtras != null) {
             // Child address arrives when the call is first set up, so we do not need to notify the
             // UI of this.
@@ -368,7 +368,7 @@ public class Call {
 
         // If the handle of the call has changed, update state for the call determining if it is an
         // emergency call.
-        Uri newHandle = mTelecommCall.getDetails().getHandle();
+        Uri newHandle = mTelecomCall.getDetails().getHandle();
         if (!Objects.equals(mHandle, newHandle)) {
             mHandle = newHandle;
             updateEmergencyCallState();
@@ -404,18 +404,18 @@ public class Call {
     }
 
     public String getNumber() {
-        if (mTelecommCall == null) {
+        if (mTelecomCall == null) {
             return null;
         }
-        if (mTelecommCall.getDetails().getGatewayInfo() != null) {
-            return mTelecommCall.getDetails().getGatewayInfo()
+        if (mTelecomCall.getDetails().getGatewayInfo() != null) {
+            return mTelecomCall.getDetails().getGatewayInfo()
                     .getOriginalAddress().getSchemeSpecificPart();
         }
         return getHandle() == null ? null : getHandle().getSchemeSpecificPart();
     }
 
     public Uri getHandle() {
-        return mTelecommCall == null ? null : mTelecommCall.getDetails().getHandle();
+        return mTelecomCall == null ? null : mTelecomCall.getDetails().getHandle();
     }
 
     public boolean isEmergencyCall() {
@@ -423,7 +423,7 @@ public class Call {
     }
 
     public int getState() {
-        if (mTelecommCall != null && mTelecommCall.getParent() != null) {
+        if (mTelecomCall != null && mTelecomCall.getParent() != null) {
             return State.CONFERENCED;
         } else {
             return mState;
@@ -435,25 +435,25 @@ public class Call {
     }
 
     public int getNumberPresentation() {
-        return mTelecommCall == null ? null : mTelecommCall.getDetails().getHandlePresentation();
+        return mTelecomCall == null ? null : mTelecomCall.getDetails().getHandlePresentation();
     }
 
     public int getCnapNamePresentation() {
-        return mTelecommCall == null ? null
-                : mTelecommCall.getDetails().getCallerDisplayNamePresentation();
+        return mTelecomCall == null ? null
+                : mTelecomCall.getDetails().getCallerDisplayNamePresentation();
     }
 
     public String getCnapName() {
-        return mTelecommCall == null ? null
-                : getTelecommCall().getDetails().getCallerDisplayName();
+        return mTelecomCall == null ? null
+                : getTelecomCall().getDetails().getCallerDisplayName();
     }
 
     public Bundle getIntentExtras() {
-        return mTelecommCall == null ? null : mTelecommCall.getDetails().getIntentExtras();
+        return mTelecomCall == null ? null : mTelecomCall.getDetails().getIntentExtras();
     }
 
     public Bundle getExtras() {
-        return mTelecommCall == null ? null : mTelecommCall.getDetails().getExtras();
+        return mTelecomCall == null ? null : mTelecomCall.getDetails().getExtras();
     }
 
     /**
@@ -492,17 +492,17 @@ public class Call {
 
     /** Returns the possible text message responses. */
     public List<String> getCannedSmsResponses() {
-        return mTelecommCall.getCannedTextResponses();
+        return mTelecomCall.getCannedTextResponses();
     }
 
     /** Checks if the call supports the given set of capabilities supplied as a bit mask. */
     public boolean can(int capabilities) {
-        int supportedCapabilities = mTelecommCall.getDetails().getCallCapabilities();
+        int supportedCapabilities = mTelecomCall.getDetails().getCallCapabilities();
 
         if ((capabilities & android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE) != 0) {
             // We allow you to merge if the capabilities allow it or if it is a call with
             // conferenceable calls.
-            if (mTelecommCall.getConferenceableCalls().isEmpty() &&
+            if (mTelecomCall.getConferenceableCalls().isEmpty() &&
                 ((android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE
                         & supportedCapabilities) == 0)) {
                 // Cannot merge calls if there are no calls to merge with.
@@ -510,33 +510,33 @@ public class Call {
             }
             capabilities &= ~android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE;
         }
-        return (capabilities == (capabilities & mTelecommCall.getDetails().getCallCapabilities()));
+        return (capabilities == (capabilities & mTelecomCall.getDetails().getCallCapabilities()));
     }
 
     public boolean hasProperty(int property) {
-        return mTelecommCall.getDetails().hasProperty(property);
+        return mTelecomCall.getDetails().hasProperty(property);
     }
 
     /** Gets the time when the call first became active. */
     public long getConnectTimeMillis() {
-        return mTelecommCall.getDetails().getConnectTimeMillis();
+        return mTelecomCall.getDetails().getConnectTimeMillis();
     }
 
     public boolean isConferenceCall() {
-        return mTelecommCall.getDetails().hasProperty(
+        return mTelecomCall.getDetails().hasProperty(
                 android.telecom.Call.Details.PROPERTY_CONFERENCE);
     }
 
     public GatewayInfo getGatewayInfo() {
-        return mTelecommCall == null ? null : mTelecommCall.getDetails().getGatewayInfo();
+        return mTelecomCall == null ? null : mTelecomCall.getDetails().getGatewayInfo();
     }
 
     public PhoneAccountHandle getAccountHandle() {
-        return mTelecommCall == null ? null : mTelecommCall.getDetails().getAccountHandle();
+        return mTelecomCall == null ? null : mTelecomCall.getDetails().getAccountHandle();
     }
 
     public VideoCall getVideoCall() {
-        return mTelecommCall == null ? null : mTelecommCall.getVideoCall();
+        return mTelecomCall == null ? null : mTelecomCall.getVideoCall();
     }
 
     public List<String> getChildCallIds() {
@@ -544,15 +544,15 @@ public class Call {
     }
 
     public String getParentId() {
-        android.telecom.Call parentCall = mTelecommCall.getParent();
+        android.telecom.Call parentCall = mTelecomCall.getParent();
         if (parentCall != null) {
-            return CallList.getInstance().getCallByTelecommCall(parentCall).getId();
+            return CallList.getInstance().getCallByTelecomCall(parentCall).getId();
         }
         return null;
     }
 
     public int getVideoState() {
-        return mTelecommCall.getDetails().getVideoState();
+        return mTelecomCall.getDetails().getVideoState();
     }
 
     public boolean isVideoCall(Context context) {
@@ -608,7 +608,7 @@ public class Call {
      * repeated calls to isEmergencyNumber.
      */
     private void updateEmergencyCallState() {
-        Uri handle = mTelecommCall.getDetails().getHandle();
+        Uri handle = mTelecomCall.getDetails().getHandle();
         mIsEmergencyCall = PhoneNumberUtils.isEmergencyNumber(
                 handle == null ? "" : handle.getSchemeSpecificPart());
     }
@@ -649,7 +649,7 @@ public class Call {
 
     @Override
     public String toString() {
-        if (mTelecommCall == null) {
+        if (mTelecomCall == null) {
             // This should happen only in testing since otherwise we would never have a null
             // Telecom call.
             return String.valueOf(mId);
@@ -660,11 +660,11 @@ public class Call {
                 mId,
                 State.toString(getState()),
                 android.telecom.Call.Details
-                        .capabilitiesToString(mTelecommCall.getDetails().getCallCapabilities()),
+                        .capabilitiesToString(mTelecomCall.getDetails().getCallCapabilities()),
                 mChildCallIds,
                 getParentId(),
-                this.mTelecommCall.getConferenceableCalls(),
-                VideoProfile.videoStateToString(mTelecommCall.getDetails().getVideoState()),
+                this.mTelecomCall.getConferenceableCalls(),
+                VideoProfile.videoStateToString(mTelecomCall.getDetails().getVideoState()),
                 mSessionModificationState,
                 getVideoSettings());
     }
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 2f81298ba..c608d3ae5 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -442,7 +442,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         if (mPrimary.isEmergencyCall() || showCallbackNumber) {
             callbackNumber = getSubscriptionNumber();
         } else {
-            StatusHints statusHints = mPrimary.getTelecommCall().getDetails().getStatusHints();
+            StatusHints statusHints = mPrimary.getTelecomCall().getDetails().getStatusHints();
             if (statusHints != null) {
                 Bundle extras = statusHints.getExtras();
                 if (extras != null) {
@@ -749,7 +749,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
      * For example, "calling via [Account/Google Voice]" for outgoing calls.
      */
     private String getConnectionLabel() {
-        StatusHints statusHints = mPrimary.getTelecommCall().getDetails().getStatusHints();
+        StatusHints statusHints = mPrimary.getTelecomCall().getDetails().getStatusHints();
         if (statusHints != null && !TextUtils.isEmpty(statusHints.getLabel())) {
             return statusHints.getLabel().toString();
         }
@@ -771,7 +771,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
 
     private Drawable getCallStateIcon() {
         // Return connection icon if one exists.
-        StatusHints statusHints = mPrimary.getTelecommCall().getDetails().getStatusHints();
+        StatusHints statusHints = mPrimary.getTelecomCall().getDetails().getStatusHints();
         if (statusHints != null && statusHints.getIcon() != null) {
             Drawable icon = statusHints.getIcon().loadDrawable(mContext);
             if (icon != null) {
@@ -940,7 +940,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
      */
     private boolean shouldShowNoteSentToast(Call call) {
         return call != null && !TextUtils
-                .isEmpty(call.getTelecommCall().getDetails().getIntentExtras().getString(
+                .isEmpty(call.getTelecomCall().getDetails().getIntentExtras().getString(
                         TelecomManager.EXTRA_CALL_SUBJECT)) &&
                 (call.getState() == Call.State.DIALING || call.getState() == Call.State.CONNECTING);
     }
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index 666ba9529..4e3315dab 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -50,7 +50,7 @@ public class CallList {
     private static CallList sInstance = new CallList();
 
     private final HashMap<String, Call> mCallById = new HashMap<>();
-    private final HashMap<android.telecom.Call, Call> mCallByTelecommCall = new HashMap<>();
+    private final HashMap<android.telecom.Call, Call> mCallByTelecomCall = new HashMap<>();
     private final HashMap<String, List<String>> mCallTextReponsesMap = Maps.newHashMap();
     /**
      * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
@@ -79,9 +79,9 @@ public class CallList {
     CallList() {
     }
 
-    public void onCallAdded(android.telecom.Call telecommCall) {
+    public void onCallAdded(android.telecom.Call telecomCall) {
         Trace.beginSection("onCallAdded");
-        Call call = new Call(telecommCall);
+        Call call = new Call(telecomCall);
         Log.d(this, "onCallAdded: callState=" + call.getState());
         if (call.getState() == Call.State.INCOMING ||
                 call.getState() == Call.State.CALL_WAITING) {
@@ -92,9 +92,9 @@ public class CallList {
         Trace.endSection();
     }
 
-    public void onCallRemoved(android.telecom.Call telecommCall) {
-        if (mCallByTelecommCall.containsKey(telecommCall)) {
-            Call call = mCallByTelecommCall.get(telecommCall);
+    public void onCallRemoved(android.telecom.Call telecomCall) {
+        if (mCallByTelecomCall.containsKey(telecomCall)) {
+            Call call = mCallByTelecomCall.get(telecomCall);
             if (updateCallInMap(call)) {
                 Log.w(this, "Removing call not previously disconnected " + call.getId());
             }
@@ -352,8 +352,8 @@ public class CallList {
         return mCallById.get(callId);
     }
 
-    public Call getCallByTelecommCall(android.telecom.Call telecommCall) {
-        return mCallByTelecommCall.get(telecommCall);
+    public Call getCallByTelecomCall(android.telecom.Call telecomCall) {
+        return mCallByTelecomCall.get(telecomCall);
     }
 
     public List<String> getTextResponses(String callId) {
@@ -473,16 +473,16 @@ public class CallList {
                 mPendingDisconnectCalls.add(call);
 
                 mCallById.put(call.getId(), call);
-                mCallByTelecommCall.put(call.getTelecommCall(), call);
+                mCallByTelecomCall.put(call.getTelecomCall(), call);
                 updated = true;
             }
         } else if (!isCallDead(call)) {
             mCallById.put(call.getId(), call);
-            mCallByTelecommCall.put(call.getTelecommCall(), call);
+            mCallByTelecomCall.put(call.getTelecomCall(), call);
             updated = true;
         } else if (mCallById.containsKey(call.getId())) {
             mCallById.remove(call.getId());
-            mCallByTelecommCall.remove(call.getTelecommCall());
+            mCallByTelecomCall.remove(call.getTelecomCall());
             updated = true;
         }
 
diff --git a/InCallUI/src/com/android/incallui/CallerInfoUtils.java b/InCallUI/src/com/android/incallui/CallerInfoUtils.java
index 21e492b7f..2cbf456b3 100644
--- a/InCallUI/src/com/android/incallui/CallerInfoUtils.java
+++ b/InCallUI/src/com/android/incallui/CallerInfoUtils.java
@@ -90,7 +90,7 @@ public class CallerInfoUtils {
          TelecomManager telecomManager =
                  (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
          return telecomManager.isVoiceMailNumber(
-                 call.getTelecommCall().getDetails().getAccountHandle(), call.getNumber());
+                 call.getTelecomCall().getDetails().getAccountHandle(), call.getNumber());
     }
 
     /**
diff --git a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
index bff04a1ec..bdd81a95b 100644
--- a/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -335,9 +335,9 @@ public class ConferenceParticipantListAdapter extends BaseAdapter {
                     new ContactLookupCallback(this));
         }
 
-        boolean thisRowCanSeparate = mParentCanSeparate && call.getTelecommCall().getDetails().can(
+        boolean thisRowCanSeparate = mParentCanSeparate && call.getTelecomCall().getDetails().can(
                 android.telecom.Call.Details.CAPABILITY_SEPARATE_FROM_CONFERENCE);
-        boolean thisRowCanDisconnect = call.getTelecommCall().getDetails().can(
+        boolean thisRowCanDisconnect = call.getTelecomCall().getDetails().can(
                 android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE);
 
         setCallerInfoForRow(result, contactCache.name, contactCache.number, contactCache.label,
diff --git a/InCallUI/src/com/android/incallui/DialpadPresenter.java b/InCallUI/src/com/android/incallui/DialpadPresenter.java
index c4ee02102..5e24bedef 100644
--- a/InCallUI/src/com/android/incallui/DialpadPresenter.java
+++ b/InCallUI/src/com/android/incallui/DialpadPresenter.java
@@ -60,7 +60,7 @@ public class DialpadPresenter extends Presenter<DialpadPresenter.DialpadUi>
 
             // Append this key to the "digits" widget.
             getUi().appendDigitsToField(c);
-            // Plays the tone through Telecomm.
+            // Plays the tone through Telecom.
             TelecomAdapter.getInstance().playDtmfTone(mCall.getId(), c);
         } else {
             Log.d(this, "ignoring dtmf request for '" + c + "'");
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index c6892b21a..5fa57f9a1 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -577,7 +577,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager {
 
                 Bundle extras = null;
                 if (call != null) {
-                    extras = call.getTelecommCall().getDetails().getIntentExtras();
+                    extras = call.getTelecomCall().getDetails().getIntentExtras();
                 }
                 if (extras == null) {
                     // Initialize the extras bundle to avoid NPE
@@ -613,7 +613,7 @@ public class InCallActivity extends Activity implements FragmentDisplayManager {
             if (pendingAccountSelectionCall != null) {
                 showCallCardFragment(false);
                 Bundle extras = pendingAccountSelectionCall
-                        .getTelecommCall().getDetails().getIntentExtras();
+                        .getTelecomCall().getDetails().getIntentExtras();
 
                 final List<PhoneAccountHandle> phoneAccountHandles;
                 if (extras != null) {
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 2d7d40a1d..83f7ae0d7 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -122,7 +122,7 @@ public class InCallPresenter implements CallList.Listener,
         @Override
         public void onPostDialWait(android.telecom.Call telecomCall,
                 String remainingPostDialSequence) {
-            final Call call = mCallList.getCallByTelecommCall(telecomCall);
+            final Call call = mCallList.getCallByTelecomCall(telecomCall);
             if (call == null) {
                 Log.w(this, "Call not found in call list: " + telecomCall);
                 return;
@@ -133,7 +133,7 @@ public class InCallPresenter implements CallList.Listener,
         @Override
         public void onDetailsChanged(android.telecom.Call telecomCall,
                 android.telecom.Call.Details details) {
-            final Call call = mCallList.getCallByTelecommCall(telecomCall);
+            final Call call = mCallList.getCallByTelecomCall(telecomCall);
             if (call == null) {
                 Log.w(this, "Call not found in call list: " + telecomCall);
                 return;
@@ -1068,7 +1068,7 @@ public class InCallPresenter implements CallList.Listener,
         // re-initiate the start-up animation, so we do not need to do anything here.
         //
         // It is also possible to go into an intermediate state where the call has been initiated
-        // but Telecomm has not yet returned with the details of the call (handle, gateway, etc.).
+        // but Telecom has not yet returned with the details of the call (handle, gateway, etc.).
         // This pending outgoing state can also launch the call screen.
         //
         // This is different from the incoming call sequence because we do not need to shock the
@@ -1163,7 +1163,7 @@ public class InCallPresenter implements CallList.Listener,
      * @param call
      */
     private void setDisconnectCauseForMissingAccounts(Call call) {
-        android.telecom.Call telecomCall = call.getTelecommCall();
+        android.telecom.Call telecomCall = call.getTelecomCall();
 
         Bundle extras = telecomCall.getDetails().getIntentExtras();
         // Initialize the extras bundle to avoid NPE
@@ -1576,7 +1576,7 @@ public class InCallPresenter implements CallList.Listener,
         WAITING_FOR_ACCOUNT,
 
         // UI is starting up but no call has been initiated yet.
-        // The UI is waiting for Telecomm to respond.
+        // The UI is waiting for Telecom to respond.
         PENDING_OUTGOING,
 
         // User is dialing out
diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
index 89fa1326c..e1a34117c 100644
--- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java
+++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
@@ -24,9 +24,9 @@ import android.telecom.CallAudioState;
 import android.telecom.InCallService;
 
 /**
- * Used to receive updates about calls from the Telecomm component.  This service is bound to
- * Telecomm while there exist calls which potentially require UI. This includes ringing (incoming),
- * dialing (outgoing), and active calls. When the last call is disconnected, Telecomm will unbind to
+ * Used to receive updates about calls from the Telecom component.  This service is bound to
+ * Telecom while there exist calls which potentially require UI. This includes ringing (incoming),
+ * dialing (outgoing), and active calls. When the last call is disconnected, Telecom will unbind to
  * the service triggering InCallActivity (via CallList) to finish soon after.
  */
 public class InCallServiceImpl extends InCallService {
diff --git a/InCallUI/src/com/android/incallui/InCallServiceListener.java b/InCallUI/src/com/android/incallui/InCallServiceListener.java
index 295385d8e..11a5b08ef 100644
--- a/InCallUI/src/com/android/incallui/InCallServiceListener.java
+++ b/InCallUI/src/com/android/incallui/InCallServiceListener.java
@@ -19,7 +19,7 @@ package com.android.incallui;
 import android.telecom.InCallService;
 
 /**
- * Interface implemented by In-Call components that maintain a reference to the Telecomm API
+ * Interface implemented by In-Call components that maintain a reference to the Telecom API
  * {@code InCallService} object. Clarifies the expectations associated with the relevant method
  * calls.
  */
diff --git a/InCallUI/src/com/android/incallui/TelecomAdapter.java b/InCallUI/src/com/android/incallui/TelecomAdapter.java
index 37efdee59..45daeed0e 100644
--- a/InCallUI/src/com/android/incallui/TelecomAdapter.java
+++ b/InCallUI/src/com/android/incallui/TelecomAdapter.java
@@ -53,13 +53,13 @@ final class TelecomAdapter implements InCallServiceListener {
         mInCallService = null;
     }
 
-    private android.telecom.Call getTelecommCallById(String callId) {
+    private android.telecom.Call getTelecomCallById(String callId) {
         Call call = CallList.getInstance().getCallById(callId);
-        return call == null ? null : call.getTelecommCall();
+        return call == null ? null : call.getTelecomCall();
     }
 
     void answerCall(String callId, int videoState) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.answer(videoState);
         } else {
@@ -68,7 +68,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void rejectCall(String callId, boolean rejectWithMessage, String message) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.reject(rejectWithMessage, message);
         } else {
@@ -77,7 +77,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void disconnectCall(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.disconnect();
         } else {
@@ -86,7 +86,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void holdCall(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.hold();
         } else {
@@ -95,7 +95,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void unholdCall(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.unhold();
         } else {
@@ -120,7 +120,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void separateCall(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.splitFromConference();
         } else {
@@ -129,7 +129,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void merge(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             List<android.telecom.Call> conferenceable = call.getConferenceableCalls();
             if (!conferenceable.isEmpty()) {
@@ -146,7 +146,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void swap(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             if (call.getDetails().can(
                     android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE)) {
@@ -179,7 +179,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void playDtmfTone(String callId, char digit) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.playDtmfTone(digit);
         } else {
@@ -188,7 +188,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void stopDtmfTone(String callId) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.stopDtmfTone();
         } else {
@@ -197,7 +197,7 @@ final class TelecomAdapter implements InCallServiceListener {
     }
 
     void postDialContinue(String callId, boolean proceed) {
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.postDialContinue(proceed);
         } else {
@@ -211,7 +211,7 @@ final class TelecomAdapter implements InCallServiceListener {
             // TODO: Do we really want to send null accountHandle?
         }
 
-        android.telecom.Call call = getTelecommCallById(callId);
+        android.telecom.Call call = getTelecomCallById(callId);
         if (call != null) {
             call.phoneAccountSelected(accountHandle, setDefault);
         } else {
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index e4d84e982..b829ab03a 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -597,7 +597,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
      * Checks for a change to the video call and changes it if required.
      */
     private void checkForVideoCallChange(Call call) {
-        final VideoCall videoCall = call.getTelecommCall().getVideoCall();
+        final VideoCall videoCall = call.getTelecomCall().getVideoCall();
         Log.d(this, "checkForVideoCallChange: videoCall=" + videoCall + " mVideoCall="
                 + mVideoCall);
         if (!Objects.equals(videoCall, mVideoCall)) {
@@ -612,7 +612,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
      * @param videoCall The new video call.
      */
     private void changeVideoCall(Call call) {
-        final VideoCall videoCall = call.getTelecommCall().getVideoCall();
+        final VideoCall videoCall = call.getTelecomCall().getVideoCall();
         Log.d(this, "changeVideoCall to videoCall=" + videoCall + " mVideoCall=" + mVideoCall);
         // Null out the surfaces on the previous video call.
         if (mVideoCall != null) {