(ImsMedia) Changed Dtmf APIs

  - startDtmf(char dtmfDigit, int volume, int duration)
    updated to sendDtmf(char dtmfDigit, int duration)
  - stopDtmf() removed

Bug: 228134488
Test: build (mm)
Change-Id: I0bea96b3a0067fe2bd99f963142a507d2e5b9270

2 files changed, 6 insertions, 21 deletions

diff --git a/framework/src/android/telephony/imsmedia/IImsAudioSession.aidl b/framework/src/android/telephony/imsmedia/IImsAudioSession.aidl
index ecd494a6..8013b6c5 100644
--- a/framework/src/android/telephony/imsmedia/IImsAudioSession.aidl
+++ b/framework/src/android/telephony/imsmedia/IImsAudioSession.aidl
@@ -32,8 +32,7 @@ interface IImsAudioSession {
     oneway void addConfig(in AudioConfig config);
     oneway void deleteConfig(in AudioConfig config);
     oneway void confirmConfig(in AudioConfig 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<RtpHeaderExtension> extensions);
     oneway void setMediaQualityThreshold(in MediaQualityThreshold threshold);
 }
diff --git a/framework/src/android/telephony/imsmedia/ImsAudioSession.java b/framework/src/android/telephony/imsmedia/ImsAudioSession.java
index 0be1d877..08edde6e 100644
--- a/framework/src/android/telephony/imsmedia/ImsAudioSession.java
+++ b/framework/src/android/telephony/imsmedia/ImsAudioSession.java
@@ -20,7 +20,6 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.telephony.ims.RtpHeaderExtension;
 import android.util.Log;
-
 import java.util.List;
 
 /**
@@ -137,29 +136,16 @@ public class ImsAudioSession implements ImsMediaSession {
     }
 
     /**
-     * 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.
      */
-    public void startDtmf(final char dtmfDigit, final int volume, final int duration) {
-        try {
-            miSession.startDtmf(dtmfDigit, volume, duration);
-        } catch (RemoteException e) {
-            Log.e(TAG, "Failed to start DTMF: " + e);
-        }
-    }
-
-    /** Stop sending the last DTMF digit */
-    public void stopDtmf() {
+    public void sendDtmf(final char dtmfDigit, final int duration) {
         try {
-            miSession.stopDtmf();
+            miSession.sendDtmf(dtmfDigit, duration);
         } catch (RemoteException e) {
-            Log.e(TAG, "Failed to stop DTMF: " + e);
+            Log.e(TAG, "Failed to send DTMF: " + e);
         }
     }