drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API Cleanup: Remove VideoState class.

Browse Source 
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
This commit is contained in:
Tyler Gunn
2015-06-03 10:09:59 -07:00
parent 6ef831fe1a
commit 87b73f370e
9 changed files with 125 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,28 +313,28 @@ public class ImsCallProfile implements Parcelable {
* @return The video state.
*/
public static int getVideoStateFromImsCallProfile(ImsCallProfile callProfile) {
int videostate = VideoProfile.VideoState.AUDIO_ONLY;
int videostate = VideoProfile.STATE_AUDIO_ONLY;
switch (callProfile.mCallType) {
case CALL_TYPE_VT_TX:
videostate = VideoProfile.VideoState.TX_ENABLED;
videostate = VideoProfile.STATE_TX_ENABLED;
break;
case CALL_TYPE_VT_RX:
videostate = VideoProfile.VideoState.RX_ENABLED;
videostate = VideoProfile.STATE_RX_ENABLED;
break;
case CALL_TYPE_VT:
videostate = VideoProfile.VideoState.BIDIRECTIONAL;
videostate = VideoProfile.STATE_BIDIRECTIONAL;
break;
case CALL_TYPE_VOICE:
videostate = VideoProfile.VideoState.AUDIO_ONLY;
videostate = VideoProfile.STATE_AUDIO_ONLY;
break;
default:
videostate = VideoProfile.VideoState.AUDIO_ONLY;
videostate = VideoProfile.STATE_AUDIO_ONLY;
break;
}
if (callProfile.isVideoPaused() && videostate != VideoProfile.VideoState.AUDIO_ONLY) {
videostate |= VideoProfile.VideoState.PAUSED;
if (callProfile.isVideoPaused() && videostate != VideoProfile.STATE_AUDIO_ONLY) {
videostate |= VideoProfile.STATE_PAUSED;
} else {
videostate &= ~VideoProfile.VideoState.PAUSED;
videostate &= ~VideoProfile.STATE_PAUSED;
}
return videostate;
}
@ -347,9 +347,9 @@ public class ImsCallProfile implements Parcelable {
* @return The call type.
*/
public static int getCallTypeFromVideoState(int videoState) {
boolean videoTx = isVideoStateSet(videoState, VideoProfile.VideoState.TX_ENABLED);
boolean videoRx = isVideoStateSet(videoState, VideoProfile.VideoState.RX_ENABLED);
boolean isPaused = isVideoStateSet(videoState, VideoProfile.VideoState.PAUSED);
boolean videoTx = isVideoStateSet(videoState, VideoProfile.STATE_TX_ENABLED);
boolean videoRx = isVideoStateSet(videoState, VideoProfile.STATE_RX_ENABLED);
boolean isPaused = isVideoStateSet(videoState, VideoProfile.STATE_PAUSED);
if (isPaused) {
return ImsCallProfile.CALL_TYPE_VT_NODIR;
} else if (videoTx && !videoRx) {