diff options
| author | Ihab Awad <ihab@google.com> | 2014-11-13 09:35:03 -0800 |
|---|---|---|
| committer | Divya Sharma <c_shard@codeaurora.org> | 2015-03-10 03:42:32 -0700 |
| commit | 616a44cbdfda78ed7a52066c7de342d63062799f (patch) | |
| tree | e495b7b01d5af7c0428959fbb5e36166a0d509d1 /src/com/android/incallui/ConferenceManagerPresenter.java | |
| parent | 16ac4886ef0186a53fe0101c0d54a87d61bb7501 (diff) | |
| download | packages_apps_InCallUI-616a44cbdfda78ed7a52066c7de342d63062799f.tar.gz packages_apps_InCallUI-616a44cbdfda78ed7a52066c7de342d63062799f.tar.bz2 packages_apps_InCallUI-616a44cbdfda78ed7a52066c7de342d63062799f.zip | |
Telecom API updates (3/6)
Bug: 18292176
Conflicts:
src/com/android/incallui/Call.java
src/com/android/incallui/CallButtonPresenter.java
src/com/android/incallui/CallCardPresenter.java
src/com/android/incallui/InCallPresenter.java
src/com/android/incallui/InCallUIMaterialColorMapUtils.java
Change-Id: I6dae81a4eb23b1e98d3769d6f991ed8840aa7c33
Diffstat (limited to 'src/com/android/incallui/ConferenceManagerPresenter.java')
| -rw-r--r-- | src/com/android/incallui/ConferenceManagerPresenter.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/com/android/incallui/ConferenceManagerPresenter.java b/src/com/android/incallui/ConferenceManagerPresenter.java index 7acd94e3..c61b1017 100644 --- a/src/com/android/incallui/ConferenceManagerPresenter.java +++ b/src/com/android/incallui/ConferenceManagerPresenter.java @@ -17,11 +17,7 @@ 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; @@ -76,18 +72,20 @@ public class ConferenceManagerPresenter @Override public void onDetailsChanged(Call call, android.telecom.Call.Details details) { - 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) { + 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) { getUi().refreshCall(call); } - if (!PhoneCapabilities.can( - details.getCallCapabilities(), PhoneCapabilities.MANAGE_CONFERENCE)) { + if (!details.can( + android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE)) { getUi().setVisible(false); } } |