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

Wiring video state through from Connection

Browse Source 
Bug: 16285417
Bug: 16013178
Change-Id: Ia48959248ca22f4569b0ffd01a1716470aa0a711
This commit is contained in:
Tyler Gunn
2014-07-17 07:50:22 -07:00
parent 3ee06efef3
commit aa07df84f2
9 changed files with 166 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.ims;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.telecomm.VideoCallProfile;
/**
* Parcelable object to handle IMS call profile.
@@ -286,4 +287,63 @@ public class ImsCallProfile implements Parcelable {
return new ImsCallProfile[size];
}
};
/**
* Converts from the call types defined in {@link com.android.ims.ImsCallProfile} to the
* video state values defined in {@link android.telecomm.VideoCallProfile}.
*
* @param callType The call type.
* @return The video state.
*/
public static int getVideoStateFromCallType(int callType) {
switch (callType) {
case CALL_TYPE_VT_NODIR:
return VideoCallProfile.VIDEO_STATE_PAUSED |
VideoCallProfile.VIDEO_STATE_BIDIRECTIONAL;
case CALL_TYPE_VT_TX:
return VideoCallProfile.VIDEO_STATE_TX_ENABLED;
case CALL_TYPE_VT_RX:
return VideoCallProfile.VIDEO_STATE_RX_ENABLED;
case CALL_TYPE_VT:
return VideoCallProfile.VIDEO_STATE_BIDIRECTIONAL;
case CALL_TYPE_VOICE:
return VideoCallProfile.VIDEO_STATE_AUDIO_ONLY;
default:
return VideoCallProfile.VIDEO_STATE_AUDIO_ONLY;
}
}
/**
* Converts from the video state values defined in {@link android.telecomm.VideoCallProfile}
* to the call types defined in {@link ImsCallProfile}.
*
* @param videoState The video state.
* @return The call type.
*/
public static int getCallTypeFromVideoState(int videoState) {
boolean videoTx = isVideoStateSet(videoState, VideoCallProfile.VIDEO_STATE_TX_ENABLED);
boolean videoRx = isVideoStateSet(videoState, VideoCallProfile.VIDEO_STATE_RX_ENABLED);
boolean isPaused = isVideoStateSet(videoState, VideoCallProfile.VIDEO_STATE_PAUSED);
if (isPaused) {
return ImsCallProfile.CALL_TYPE_VT_NODIR;
} else if (videoTx && !videoRx) {
return ImsCallProfile.CALL_TYPE_VT_TX;
} else if (!videoTx && videoRx) {
return ImsCallProfile.CALL_TYPE_VT_RX;
} else if (videoTx && videoRx) {
return ImsCallProfile.CALL_TYPE_VT;
}
return ImsCallProfile.CALL_TYPE_VOICE;
}
/**
* Determines if a video state is set in a video state bit-mask.
*
* @param videoState The video state bit mask.
* @param videoStateToCheck The particular video state to check.
* @return True if the video state is set in the bit-mask.
*/
private static boolean isVideoStateSet(int videoState, int videoStateToCheck) {
return (videoState & videoStateToCheck) == videoStateToCheck;
}
}