Merge "(ImsMedia) Changed Dtmf APIs" into main-ims-dev
diff --git a/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/IImsMediaSession.aidl b/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/IImsMediaSession.aidl
index 03d0fcc..38d9d02 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/IImsMediaSession.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.ims.media/current/android/hardware/radio/ims/media/IImsMediaSession.aidl
@@ -39,8 +39,7 @@
oneway void addConfig(in android.hardware.radio.ims.media.RtpConfig config);
oneway void deleteConfig(in android.hardware.radio.ims.media.RtpConfig config);
oneway void confirmConfig(in android.hardware.radio.ims.media.RtpConfig config);
- oneway void startDtmf(char dtmfDigit, int volume, int duration);
- oneway void stopDtmf();
+ oneway void sendDtmf(char dtmfDigit, int duration);
oneway void sendHeaderExtension(in List<android.hardware.radio.ims.media.RtpHeaderExtension> extensions);
oneway void setMediaQualityThreshold(in android.hardware.radio.ims.media.MediaQualityThreshold threshold);
}
diff --git a/radio/aidl/android/hardware/radio/ims/media/IImsMediaSession.aidl b/radio/aidl/android/hardware/radio/ims/media/IImsMediaSession.aidl
index 3e29356..8c73bbc 100644
--- a/radio/aidl/android/hardware/radio/ims/media/IImsMediaSession.aidl
+++ b/radio/aidl/android/hardware/radio/ims/media/IImsMediaSession.aidl
@@ -28,7 +28,6 @@
*/
@VintfStability
oneway interface IImsMediaSession {
-
/**
* Set the listener functions to receive IMS media session specific notifications.
*
@@ -76,19 +75,12 @@
void confirmConfig(in RtpConfig config);
/**
- * Start sending DTMF digit until the duration expires or a stopDtmf() API
- * is received. If the implementation is currently playing a DTMF tone, that
- * tone must be stopped first using stopDtmf().
+ * Send DTMF digit until the duration expires.
*
* @param dtmfDigit single char having one of 12 values: 0-9, *, #
- * @param volume of the DTMF digit between 0 and -63 dBm dropping the sign.
- * @param duration of the key press in milliseconds. -1 means no duration
- * is passed and the caller will invoke stopDtmf().
+ * @param duration of the key press in milliseconds.
*/
- void startDtmf(char dtmfDigit, int volume, int duration);
-
- /** Stop sending the last DTMF digit started by startDtmf. */
- void stopDtmf();
+ void sendDtmf(char dtmfDigit, int duration);
/**
* Send RTP header extension to the other party in the next RTP packet.