summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-09-12 22:16:48 -0700
committerTyler Gunn <tgunn@google.com>2014-09-12 22:16:48 -0700
commit4b293f0f08030c97e1bb54d2f79ac2fb1a6e29ae (patch)
tree3d08939fee48787580c0b215084162b578128ea1 /InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
parent6861dc525e2caa9ced087e1c11ad0274e6e6ea12 (diff)
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: Ie5ae18f51baa5da2eb9793785ad0c9d83b6343d1
Diffstat (limited to 'InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java')
-rw-r--r--InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index ba01e7597..269f37d9c 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -18,7 +18,7 @@ package com.android.incallui;
import android.content.Context;
import android.net.Uri;
-import android.telecomm.PhoneCapabilities;
+import android.telecom.PhoneCapabilities;
import android.text.TextUtils;
import com.android.incallui.ContactInfoCache.ContactCacheEntry;
@@ -166,13 +166,13 @@ public class ConferenceManagerPresenter
public void separateConferenceConnection(int rowId) {
if (rowId < mCallerIds.length) {
- TelecommAdapter.getInstance().separateCall(mCallerIds[rowId]);
+ TelecomAdapter.getInstance().separateCall(mCallerIds[rowId]);
}
}
public void endConferenceConnection(int rowId) {
if (rowId < mCallerIds.length) {
- TelecommAdapter.getInstance().disconnectCall(mCallerIds[rowId]);
+ TelecomAdapter.getInstance().disconnectCall(mCallerIds[rowId]);
}
}