commit 5cf7f01aa00d67edbcd9d65fbfcbc1a4c56f60c3
author Tyler Gunn <tgunn@google.com> Wed Sep 10 15:20:21 2014 -0700
committer Tyler Gunn <tgunn@google.com> Fri Sep 12 20:20:12 2014 -0700
tree 0e40f1a417084beba49595beb0b9d0ef77f7928b
parent 88ebfb9c7ad4602c8f2103773b5dd040c2bab775

Renaming Telecomm to Telecom.

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I6cae2868fa8b8d2fe872771ecac628add52fea84

src/com/android/contacts/common/CallUtil.java

diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index 0d143c7..ea0299c 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -19,10 +19,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.telecomm.PhoneAccount;
-import android.telecomm.PhoneAccountHandle;
-import android.telecomm.TelecommManager;
-import android.telecomm.VideoProfile;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
 
 import com.android.contacts.common.util.PhoneNumberHelper;
 import com.android.phone.common.PhoneConstants;
@@ -98,7 +98,7 @@
     }
 
     /**
-     * A variant of {@link #getCallIntent(String, String, android.telecomm.PhoneAccountHandle)} for
+     * A variant of {@link #getCallIntent(String, String, android.telecom.PhoneAccountHandle)} for
      * starting a video call.
      */
     public static Intent getVideoCallIntent(
@@ -108,7 +108,7 @@
     }
 
     /**
-     * A variant of {@link #getCallIntent(String, String, android.telecomm.PhoneAccountHandle)} for
+     * A variant of {@link #getCallIntent(String, String, android.telecom.PhoneAccountHandle)} for
      * starting a video call.
      */
     public static Intent getVideoCallIntent(String number, PhoneAccountHandle accountHandle) {
@@ -123,12 +123,12 @@
     public static Intent getCallIntent(
             Uri uri, String callOrigin, PhoneAccountHandle accountHandle, int videoState) {
         final Intent intent = new Intent(Intent.ACTION_CALL, uri);
-        intent.putExtra(TelecommManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState);
+        intent.putExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState);
         if (callOrigin != null) {
             intent.putExtra(PhoneConstants.EXTRA_CALL_ORIGIN, callOrigin);
         }
         if (accountHandle != null) {
-            intent.putExtra(TelecommManager.EXTRA_PHONE_ACCOUNT_HANDLE, accountHandle);
+            intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, accountHandle);
         }
 
         return intent;
@@ -146,8 +146,8 @@
      }
 
     public static boolean isVideoEnabled(Context context) {
-        TelecommManager telecommMgr = (TelecommManager)
-                context.getSystemService(Context.TELECOMM_SERVICE);
+        TelecomManager telecommMgr = (TelecomManager)
+                context.getSystemService(Context.TELECOM_SERVICE);
         if (telecommMgr == null) {
             return false;
         }

src/com/android/contacts/common/list/ShortcutIntentBuilder.java

diff --git a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
index 90c6d0c..6c97fd9 100644
--- a/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/common/list/ShortcutIntentBuilder.java
@@ -38,7 +38,7 @@
 import android.provider.ContactsContract.Data;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
 import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;