Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding some new multi-endpoint stuff." into nyc-dev

Browse Source
This commit is contained in:
Tyler Gunn
2016-04-15 21:01:11 +00:00
committed by Android (Google) Code Review
parent b3e26a9b41 9eb78515dc
commit a6f12cf3d0
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/java/com/android/ims/ImsCallProfile.java
View File

@@ -336,12 +336,27 @@ public class ImsCallProfile implements Parcelable {
* Converts from the call types defined in {@link com.android.ims.ImsCallProfile} to the * Converts from the call types defined in {@link com.android.ims.ImsCallProfile} to the
* video state values defined in {@link VideoProfile}. * video state values defined in {@link VideoProfile}.
* *
* @param callType The call type. * @param callProfile The call profile.
* @return The video state. * @return The video state.
*/ */
public static int getVideoStateFromImsCallProfile(ImsCallProfile callProfile) { public static int getVideoStateFromImsCallProfile(ImsCallProfile callProfile) {
int videostate = getVideoStateFromCallType(callProfile.mCallType);
if (callProfile.isVideoPaused() && !VideoProfile.isAudioOnly(videostate)) {
videostate |= VideoProfile.STATE_PAUSED;
} else {
videostate &= ~VideoProfile.STATE_PAUSED;
}
return videostate;
}
/**
* Translates a {@link ImsCallProfile} {@code CALL_TYPE_*} constant into a video state.
* @param callType The call type.
* @return The video state.
*/
public static int getVideoStateFromCallType(int callType) {
int videostate = VideoProfile.STATE_AUDIO_ONLY; int videostate = VideoProfile.STATE_AUDIO_ONLY;
switch (callProfile.mCallType) { switch (callType) {
case CALL_TYPE_VT_TX: case CALL_TYPE_VT_TX:
videostate = VideoProfile.STATE_TX_ENABLED; videostate = VideoProfile.STATE_TX_ENABLED;
break; break;
@@ -358,11 +373,6 @@ public class ImsCallProfile implements Parcelable {
videostate = VideoProfile.STATE_AUDIO_ONLY; videostate = VideoProfile.STATE_AUDIO_ONLY;
break; break;
} }
if (callProfile.isVideoPaused() && !VideoProfile.isAudioOnly(videostate)) {
videostate |= VideoProfile.STATE_PAUSED;
} else {
videostate &= ~VideoProfile.STATE_PAUSED;
}
return videostate; return videostate;
} }

5
telephony/java/com/android/ims/ImsReasonInfo.java
View File

@@ -216,6 +216,11 @@ public class ImsReasonInfo implements Parcelable {
*/ */
public static final int CODE_ECBM_NOT_SUPPORTED = 901; public static final int CODE_ECBM_NOT_SUPPORTED = 901;
/**
* Fail code used to indicate that Multi-endpoint is not supported by the Ims framework.
*/
public static final int CODE_MULTIENDPOINT_NOT_SUPPORTED = 902;
/** /**
* Ims Registration error code * Ims Registration error code
*/ */