diff options
| author | Sailesh Nepal <sail@google.com> | 2014-05-14 19:36:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-14 19:36:26 +0000 |
| commit | ece678e33aca03753b59d534e789e5f6075750a1 (patch) | |
| tree | fb5bddcd19c25885d725a0ebba1abd9f9e2712ef /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
| parent | 89997ad9918b9b15e7dfc022ce9230f67a1aa6e2 (diff) | |
| parent | f27342bc5d594dfc32dc2bfafe109dcaa6b6d506 (diff) | |
am b48e2280: InCallUI: Use Telecomm CallCapabilites
* commit 'b48e2280930b5ed0b04dd34d59dc5980b379a475':
InCallUI: Use Telecomm CallCapabilites
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index eca4dbfc8..ab62af5be 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -23,13 +23,13 @@ import android.graphics.drawable.Drawable; import android.graphics.Bitmap; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; +import android.telecomm.CallCapabilities; import android.telephony.DisconnectCause; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.text.format.DateUtils; import com.android.incallui.AudioModeProvider.AudioModeListener; -import com.android.incallui.Call.Capabilities; import com.android.incallui.ContactInfoCache.ContactCacheEntry; import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback; import com.android.incallui.InCallPresenter.InCallState; @@ -292,7 +292,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } private static boolean isGenericConference(Call call) { - return call != null && call.can(Capabilities.GENERIC_CONFERENCE); + return call != null && call.can(CallCapabilities.GENERIC_CONFERENCE); } private void updateContactEntry(ContactCacheEntry entry, boolean isPrimary, |