Added changes to move CMR from CodecParams to EvsParams

Test: Tested with device

Bug: 236357306
Change-Id: Ib319ef0150e5e9aabfd3ffdb24852923ffbe5a90

2 files changed, 19 insertions, 14 deletions

diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioConfigTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioConfigTest.java
index a56bb3ca..e7e91a2e 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/AudioConfigTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/AudioConfigTest.java
@@ -58,7 +58,6 @@ public class AudioConfigTest {
     private static final byte SAMPLING_RATE = 98;
     private static final byte PTIME = 99;
     private static final int MAX_PTIME = 240;
-    private static final byte CMR = 100;
     private static final boolean DTX_ENABLED = true;
     private static final byte DTMF_PAYLOAD = 126;
     private static final byte DTMF_SAMPLING_RATE = 127;
@@ -91,7 +90,6 @@ public class AudioConfigTest {
                 RtpConfig.MEDIA_DIRECTION_SEND_RECEIVE);
         assertThat(config.getPtimeMillis()).isEqualTo(PTIME);
         assertThat(config.getMaxPtimeMillis()).isEqualTo(MAX_PTIME);
-        assertThat(config.getCodecModeRequest()).isEqualTo(CMR);
         assertThat(config.getDtxEnabled()).isEqualTo(DTX_ENABLED);
         assertThat(config.getCodecType()).isEqualTo(AudioConfig.CODEC_EVS);
         assertThat(config.getTxDtmfPayloadTypeNumber()).isEqualTo(DTMF_PAYLOAD);
@@ -146,7 +144,6 @@ public class AudioConfigTest {
                 .setSamplingRateKHz(SAMPLING_RATE)
                 .setPtimeMillis(PTIME)
                 .setMaxPtimeMillis(MAX_PTIME)
-                .setCodecModeRequest(CMR)
                 .setDtxEnabled(DTX_ENABLED)
                 .setCodecType(AudioConfig.CODEC_EVS)
                 .setTxDtmfPayloadTypeNumber(DTMF_PAYLOAD)
@@ -172,7 +169,6 @@ public class AudioConfigTest {
                 .setSamplingRateKHz(SAMPLING_RATE)
                 .setPtimeMillis(PTIME)
                 .setMaxPtimeMillis(MAX_PTIME)
-                .setCodecModeRequest(CMR)
                 .setDtxEnabled(DTX_ENABLED)
                 .setCodecType(AudioConfig.CODEC_EVS)
                 .setTxDtmfPayloadTypeNumber(DTMF_PAYLOAD)
diff --git a/tests/unit/src/com/android/telephony/imsmedia/EvsParamsTest.java b/tests/unit/src/com/android/telephony/imsmedia/EvsParamsTest.java
index d2c3efd9..ac9b5bec 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/EvsParamsTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/EvsParamsTest.java
@@ -29,36 +29,40 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class EvsParamsTest {
     private static final byte CHANNEL_AWARE_MODE = 7;
+    private static final byte CODEC_MODE_REQUEST = 15;
     private static final boolean USE_HEADER_FULL_ONLY = true;
 
     private EvsParams createEvsParams(
             final int evsBandwidth,
             final int evsMode,
             final byte channelAwareMode,
-            final boolean useHeaderFullOnly) {
+            final boolean useHeaderFullOnly,
+            final byte codecModeRequest) {
         return new EvsParams.Builder()
                 .setEvsbandwidth(evsBandwidth)
                 .setEvsMode(evsMode)
                 .setChannelAwareMode(channelAwareMode)
                 .setHeaderFullOnly(useHeaderFullOnly)
+                .setCodecModeRequest(codecModeRequest)
                 .build();
     }
 
     @Test
     public void testConstructorAndGetters() {
         EvsParams evs = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         assertThat(evs.getEvsBandwidth()).isEqualTo(EvsParams.EVS_WIDE_BAND);
         assertThat(evs.getEvsMode()).isEqualTo(EvsParams.EVS_MODE_7);
         assertThat(evs.getChannelAwareMode()).isEqualTo(CHANNEL_AWARE_MODE);
         assertThat(evs.getUseHeaderFullOnly()).isEqualTo(USE_HEADER_FULL_ONLY);
+        assertThat(evs.getCodecModeRequest()).isEqualTo(CODEC_MODE_REQUEST);
     }
 
     @Test
     public void testParcel() {
         EvsParams evs = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         Parcel parcel = Parcel.obtain();
         evs.writeToParcel(parcel, 0);
@@ -71,10 +75,10 @@ public class EvsParamsTest {
     @Test
     public void testEqual() {
         EvsParams evs1 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         EvsParams evs2 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         assertThat(evs1).isEqualTo(evs2);
     }
@@ -82,26 +86,31 @@ public class EvsParamsTest {
     @Test
     public void testNotEqual() {
         EvsParams evs1 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         EvsParams evs2 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_6,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         assertThat(evs1).isNotEqualTo(evs2);
 
         EvsParams evs3 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                (byte) 8, USE_HEADER_FULL_ONLY);
+                (byte) 8, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         assertThat(evs1).isNotEqualTo(evs3);
 
         EvsParams evs4 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, false);
+                CHANNEL_AWARE_MODE, false, CODEC_MODE_REQUEST);
 
         assertThat(evs1).isNotEqualTo(evs4);
 
         EvsParams evs6 = createEvsParams(EvsParams.EVS_SUPER_WIDE_BAND, EvsParams.EVS_MODE_7,
-                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY);
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, CODEC_MODE_REQUEST);
 
         assertThat(evs1).isNotEqualTo(evs6);
+
+        EvsParams evs7 = createEvsParams(EvsParams.EVS_WIDE_BAND, EvsParams.EVS_MODE_7,
+                CHANNEL_AWARE_MODE, USE_HEADER_FULL_ONLY, (byte) 14);
+
+        assertThat(evs1).isNotEqualTo(evs7);
     }
 }