diff options
Diffstat (limited to 'src/com/android/incallui/Call.java')
| -rw-r--r-- | src/com/android/incallui/Call.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/incallui/Call.java b/src/com/android/incallui/Call.java index 3bac3715..debe960e 100644 --- a/src/com/android/incallui/Call.java +++ b/src/com/android/incallui/Call.java @@ -24,7 +24,6 @@ import android.hardware.camera2.CameraCharacteristics; import android.net.Uri; import android.telecom.CallProperties; import android.telecom.DisconnectCause; -import android.telecom.PhoneCapabilities; import android.telecom.GatewayInfo; import android.telecom.InCallService.VideoCall; import android.telecom.PhoneAccountHandle; @@ -395,7 +394,7 @@ public final class Call { public boolean can(int capabilities) { int supportedCapabilities = mTelecommCall.getDetails().getCallCapabilities(); - if ((capabilities & PhoneCapabilities.MERGE_CONFERENCE) != 0) { + if ((capabilities & android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE) != 0) { // We allow you to merge if the capabilities allow it or if it is a call with // conferenceable calls. if (CallList.getInstance().isDsdaEnabled()) { @@ -415,18 +414,18 @@ public final class Call { } } if (!hasConfenceableCall && - ((PhoneCapabilities.MERGE_CONFERENCE & supportedCapabilities) == 0)) { + ((android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE & supportedCapabilities) == 0)) { // Cannot merge calls if there are no calls to merge with. return false; } } else if (mTelecommCall.getConferenceableCalls().isEmpty() || - ((PhoneCapabilities.MERGE_CONFERENCE & supportedCapabilities) == 0)) { + ((android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE & supportedCapabilities) == 0)) { // Cannot merge calls if there are no calls to merge with or // capability to merge is missing return false; } // Clearing this bit means this capability is available - capabilities &= ~PhoneCapabilities.MERGE_CONFERENCE; + capabilities &= ~android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE; } return (capabilities == (capabilities & mTelecommCall.getDetails().getCallCapabilities())); } @@ -603,7 +602,8 @@ public final class Call { + "VideoSettings:%s]", mId, State.toString(getState()), - PhoneCapabilities.toString(mTelecommCall.getDetails().getCallCapabilities()), + android.telecom.Call.Details + .capabilitiesToString(mTelecommCall.getDetails().getCallCapabilities()), mChildCallIds, getParentId(), mTelecommCall.getDetails().getVideoState(), mIsActiveSub, |