diff options
| -rw-r--r-- | telephony/java/android/telephony/ims/ImsCallSessionListener.java | 53 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java | 2 |
2 files changed, 8 insertions, 47 deletions
diff --git a/telephony/java/android/telephony/ims/ImsCallSessionListener.java b/telephony/java/android/telephony/ims/ImsCallSessionListener.java index 93cea254ccfc..4836f86fe3e1 100644 --- a/telephony/java/android/telephony/ims/ImsCallSessionListener.java +++ b/telephony/java/android/telephony/ims/ImsCallSessionListener.java @@ -16,7 +16,6 @@ package android.telephony.ims; -import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; @@ -27,12 +26,12 @@ import android.telephony.CallQuality; import android.telephony.ServiceState; import android.telephony.ims.aidl.IImsCallSessionListener; import android.telephony.ims.stub.ImsCallSessionImplBase; +import android.telephony.ims.stub.ImsCallSessionImplBase.MediaStreamDirection; +import android.telephony.ims.stub.ImsCallSessionImplBase.MediaStreamType; import android.util.Log; import com.android.ims.internal.IImsCallSession; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Objects; import java.util.Set; @@ -814,55 +813,15 @@ public class ImsCallSessionListener { } } - /** @hide */ - @IntDef(flag = true, - value = { - MEDIA_STREAM_TYPE_AUDIO, - MEDIA_STREAM_TYPE_VIDEO, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaStreamType {} - - /** - * Media Stream Type - Audio - * @hide - */ - public static final int MEDIA_STREAM_TYPE_AUDIO = 1; - /** - * Media Stream Type - Video - * @hide - */ - public static final int MEDIA_STREAM_TYPE_VIDEO = 2; - - /** @hide */ - @IntDef(flag = true, - value = { - MEDIA_STREAM_DIRECTION_UPLINK, - MEDIA_STREAM_DIRECTION_DOWNLINK, - }) - @Retention(RetentionPolicy.SOURCE) - public @interface MediaStreamDirection {} - - /** - * Media Stream Direction - Uplink - * @hide - */ - public static final int MEDIA_STREAM_DIRECTION_UPLINK = 1; - /** - * Media Stream Direction - Downlink - * @hide - */ - public static final int MEDIA_STREAM_DIRECTION_DOWNLINK = 2; - /** * Access Network Bitrate Recommendation Query (ANBRQ), see 3GPP TS 26.114. * This API triggers radio to send ANBRQ message to the access network to query the * desired bitrate. * - * @param mediaType {@link MediaStreamType} is used to identify media stream such as - * audio or video. - * @param direction {@link MediaStreamDirection} of this packet stream (e.g. uplink - * or downlink). + * @param mediaType {@link ImsCallSessionImplBase.MediaStreamType} is used to identify + * media stream such as audio or video. + * @param direction {@link ImsCallSessionImplBase.MediaStreamDirection} of this packet + * stream (e.g. uplink or downlink). * @param bitsPerSecond This value is the bitrate requested by the other party UE through * RTP CMR, RTCPAPP or TMMBR, and ImsStack converts this value to the MAC bitrate * (defined in TS36.321, range: 0 ~ 8000 kbit/s). diff --git a/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java index e46351dcf820..3ab4ee691e67 100644 --- a/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsCallSessionImplBase.java @@ -74,6 +74,7 @@ public class ImsCallSessionImplBase implements AutoCloseable { /** @hide */ @IntDef( + prefix = "MEDIA_STREAM_TYPE_", value = { MEDIA_STREAM_TYPE_AUDIO, MEDIA_STREAM_TYPE_VIDEO @@ -94,6 +95,7 @@ public class ImsCallSessionImplBase implements AutoCloseable { /** @hide */ @IntDef( + prefix = "MEDIA_STREAM_DIRECTION_", value = { MEDIA_STREAM_DIRECTION_UPLINK, MEDIA_STREAM_DIRECTION_DOWNLINK |