(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, 13 insertions, 41 deletions

diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java
index edad32ea..29b31c06 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java
@@ -17,6 +17,7 @@
 package com.android.telephony.imsmedia;
 
 import static com.google.common.truth.Truth.assertThat;
+import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -25,7 +26,6 @@ import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static junit.framework.Assert.assertEquals;
 
 import android.hardware.radio.ims.media.IImsMedia;
 import android.hardware.radio.ims.media.IImsMediaSession;
@@ -37,24 +37,21 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
+import android.telephony.ims.RtpHeaderExtension;
 import android.telephony.imsmedia.AudioConfig;
 import android.telephony.imsmedia.IImsAudioSessionCallback;
 import android.telephony.imsmedia.ImsMediaSession;
 import android.telephony.imsmedia.MediaQualityThreshold;
-import android.telephony.ims.RtpHeaderExtension;
 import android.testing.TestableLooper;
-
-import com.android.telephony.imsmedia.AudioSession;
 import com.android.telephony.imsmedia.AudioService;
+import com.android.telephony.imsmedia.AudioSession;
 import com.android.telephony.imsmedia.Utils;
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
-
 import java.net.DatagramSocket;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -307,30 +304,17 @@ public class AudioOffloadTest {
     }
 
     @Test
-    public void testStartDtmf() {
-        audioSession.startDtmf(DTMF_DIGIT, DTMF_VOL, DTMF_DURATION);
+    public void testsendDtmf() {
+        audioSession.sendDtmf(DTMF_DIGIT, DTMF_DURATION);
         processAllMessages();
         try {
-            verify(imsMediaSession, times(1)).startDtmf
-                    (eq(DTMF_DIGIT), eq(DTMF_VOL), eq(DTMF_DURATION));
+            verify(imsMediaSession, times(1)).sendDtmf(eq(DTMF_DIGIT), eq(DTMF_DURATION));
         } catch(RemoteException e) {
-            fail("Failed to invoke startDtmf: " + e);
+            fail("Failed to invoke sendDtmf: " + e);
         }
     }
 
     @Test
-    public void testStopDtmf() {
-        audioSession.stopDtmf();
-        processAllMessages();
-        try {
-            verify(imsMediaSession, times(1)).stopDtmf();
-        } catch(RemoteException e) {
-            fail("Failed to invoke stopDtmf: " + e);
-        }
-
-    }
-
-    @Test
     public void testSetMediaQualityThreshold() {
         // Set Media Quality Threshold
         MediaQualityThreshold threshold = MediaQualityThresholdTest.createMediaQualityThreshold();
diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java
index 2ce48cdb..06e370e4 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java
@@ -22,27 +22,24 @@ import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import android.os.Parcel;
 import android.os.Looper;
 import android.os.Message;
+import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
+import android.telephony.ims.RtpHeaderExtension;
 import android.telephony.imsmedia.AudioConfig;
 import android.telephony.imsmedia.IImsAudioSessionCallback;
 import android.telephony.imsmedia.ImsMediaSession;
 import android.telephony.imsmedia.MediaQualityThreshold;
-import android.telephony.ims.RtpHeaderExtension;
 import android.testing.TestableLooper;
-
-import com.android.telephony.imsmedia.AudioSession;
 import com.android.telephony.imsmedia.AudioService;
+import com.android.telephony.imsmedia.AudioSession;
 import com.android.telephony.imsmedia.Utils;
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
-
 import java.net.DatagramSocket;
 import java.net.SocketException;
 import java.util.ArrayList;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +51,6 @@ import org.mockito.MockitoAnnotations;
 @RunWith(JUnit4.class)
 public class AudioSessionTest {
     private static final int SESSION_ID = 1;
-    private static final int DTMF_VOL = 50;
     private static final int DTMF_DURATION = 120;
     private static final int UNUSED = -1;
     private static final int SUCCESS = ImsMediaSession.RESULT_SUCCESS;
@@ -244,18 +240,10 @@ public class AudioSessionTest {
     }
 
     @Test
-    public void testStartDtmf() {
-        audioSession.startDtmf(DTMF_DIGIT, DTMF_VOL, DTMF_DURATION);
-        processAllMessages();
-        verify(audioLocalSession, times(1)).startDtmf(eq(DTMF_DIGIT), eq(DTMF_VOL),
-            eq(DTMF_DURATION));
-    }
-
-    @Test
-    public void testStopDtmf() {
-        audioSession.stopDtmf();
+    public void testsendDtmf() {
+        audioSession.sendDtmf(DTMF_DIGIT, DTMF_DURATION);
         processAllMessages();
-        verify(audioLocalSession, times(1)).stopDtmf();
+        verify(audioLocalSession, times(1)).sendDtmf(eq(DTMF_DIGIT), eq(DTMF_DURATION));
     }
 
     @Test