diff options
| author | Ihab Awad <ihab@google.com> | 2014-08-13 18:57:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | df22cbc9ad5f50b3913353f27b51a3ce5828c78f (patch) | |
| tree | 8b28c6087cc26ae6212c5653a3f64ecb957f7858 /telephony/java/com/android/ims/ImsCallProfile.java | |
| parent | a33ec00e4952ca99a2f8606b4935e4023ad54992 (diff) | |
| parent | b19a0bcdd8a5020c61a0d697f600fdc943c86f59 (diff) | |
Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev
Diffstat (limited to 'telephony/java/com/android/ims/ImsCallProfile.java')
| -rw-r--r-- | telephony/java/com/android/ims/ImsCallProfile.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java index adcb4350fb4c..dcd0b792f720 100644 --- a/telephony/java/com/android/ims/ImsCallProfile.java +++ b/telephony/java/com/android/ims/ImsCallProfile.java @@ -19,7 +19,7 @@ package com.android.ims; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.telecomm.VideoCallProfile; +import android.telecomm.VideoProfile; /** * Parcelable object to handle IMS call profile. @@ -290,7 +290,7 @@ public class ImsCallProfile implements Parcelable { /** * Converts from the call types defined in {@link com.android.ims.ImsCallProfile} to the - * video state values defined in {@link android.telecomm.VideoCallProfile}. + * video state values defined in {@link VideoProfile}. * * @param callType The call type. * @return The video state. @@ -298,32 +298,32 @@ public class ImsCallProfile implements Parcelable { public static int getVideoStateFromCallType(int callType) { switch (callType) { case CALL_TYPE_VT_NODIR: - return VideoCallProfile.VideoState.PAUSED | - VideoCallProfile.VideoState.BIDIRECTIONAL; + return VideoProfile.VideoState.PAUSED | + VideoProfile.VideoState.BIDIRECTIONAL; case CALL_TYPE_VT_TX: - return VideoCallProfile.VideoState.TX_ENABLED; + return VideoProfile.VideoState.TX_ENABLED; case CALL_TYPE_VT_RX: - return VideoCallProfile.VideoState.RX_ENABLED; + return VideoProfile.VideoState.RX_ENABLED; case CALL_TYPE_VT: - return VideoCallProfile.VideoState.BIDIRECTIONAL; + return VideoProfile.VideoState.BIDIRECTIONAL; case CALL_TYPE_VOICE: - return VideoCallProfile.VideoState.AUDIO_ONLY; + return VideoProfile.VideoState.AUDIO_ONLY; default: - return VideoCallProfile.VideoState.AUDIO_ONLY; + return VideoProfile.VideoState.AUDIO_ONLY; } } /** - * Converts from the video state values defined in {@link android.telecomm.VideoCallProfile} + * Converts from the video state values defined in {@link VideoProfile} * 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.VideoState.TX_ENABLED); - boolean videoRx = isVideoStateSet(videoState, VideoCallProfile.VideoState.RX_ENABLED); - boolean isPaused = isVideoStateSet(videoState, VideoCallProfile.VideoState.PAUSED); + boolean videoTx = isVideoStateSet(videoState, VideoProfile.VideoState.TX_ENABLED); + boolean videoRx = isVideoStateSet(videoState, VideoProfile.VideoState.RX_ENABLED); + boolean isPaused = isVideoStateSet(videoState, VideoProfile.VideoState.PAUSED); if (isPaused) { return ImsCallProfile.CALL_TYPE_VT_NODIR; } else if (videoTx && !videoRx) { |