diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-03-24 23:42:47 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-25 03:23:25 -0700 |
| commit | bce297e9385c691a257961538c00d02196910027 (patch) | |
| tree | 63fc1e840c6f43aeb38363c86e7b23d9a9257df8 /src/com/android/incallui/TelecomAdapter.java | |
| parent | 11f663cbbb40200d5171171e2c777a6a31859edc (diff) | |
| parent | d27ad14ef320762f4303b0794d2ae0f339f76d2d (diff) | |
| download | packages_apps_InCallUI-bce297e9385c691a257961538c00d02196910027.tar.gz packages_apps_InCallUI-bce297e9385c691a257961538c00d02196910027.tar.bz2 packages_apps_InCallUI-bce297e9385c691a257961538c00d02196910027.zip | |
Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/InCallUI into cm-12.1staging/cm-12.1-test
Change-Id: I7d550c092380b050f7cbc714006bc4ed94b08a56
Diffstat (limited to 'src/com/android/incallui/TelecomAdapter.java')
| -rw-r--r-- | src/com/android/incallui/TelecomAdapter.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/incallui/TelecomAdapter.java b/src/com/android/incallui/TelecomAdapter.java index 6acb6404..b0fcc128 100644 --- a/src/com/android/incallui/TelecomAdapter.java +++ b/src/com/android/incallui/TelecomAdapter.java @@ -24,8 +24,6 @@ import android.telecom.InCallAdapter; import android.telecom.Phone; import android.telecom.PhoneAccountHandle; -import android.telecom.PhoneCapabilities; - import com.google.common.base.Preconditions; import java.util.List; @@ -181,8 +179,8 @@ final class TelecomAdapter implements InCallPhoneListener { if (!conferenceable.isEmpty()) { call.conference(conferenceable.get(0)); } else { - int capabilities = call.getDetails().getCallCapabilities(); - if (0 != (capabilities & PhoneCapabilities.MERGE_CONFERENCE)) { + if (call.getDetails().can( + android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE)) { call.mergeConference(); } } @@ -194,8 +192,8 @@ final class TelecomAdapter implements InCallPhoneListener { void swap(String callId) { if (mPhone != null) { android.telecom.Call call = getTelecommCallById(callId); - int capabilities = call.getDetails().getCallCapabilities(); - if (0 != (capabilities & PhoneCapabilities.SWAP_CONFERENCE)) { + if (call.getDetails().can( + android.telecom.Call.Details.CAPABILITY_SWAP_CONFERENCE)) { call.swapConference(); } } else { @@ -248,8 +246,7 @@ final class TelecomAdapter implements InCallPhoneListener { } } - void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle, - boolean setDefault) { + void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle, boolean setDefault) { if (mPhone != null) { getTelecommCallById(callId).phoneAccountSelected(accountHandle, setDefault); } else { |