UT failures and errorprone build errors resolved

Bug: 257289693
Bug: 257918316
Test: atest ImsMediaJavaUnitTests && atest ImsMediaNativeTests
Change-Id: I9ecfd67b87494d895adf30f8b04707c36877e18f

4 files changed, 72 insertions, 3 deletions

diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/android/telephony/imsmedia/AudioConfigTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/android/telephony/imsmedia/AudioConfigTest.cpp
index 878663fc..3beca9fa 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/android/telephony/imsmedia/AudioConfigTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia_config/android/telephony/imsmedia/AudioConfigTest.cpp
@@ -235,3 +235,71 @@ TEST_F(AudioConfigTest, TestParcelWithoutRtcp)
     EXPECT_EQ(configRead.getRtcpConfig().getIntervalSec(), 0);
     EXPECT_EQ(configRead.getRtcpConfig().getRtcpXrBlockTypes(), RtcpConfig::FLAG_RTCPXR_NONE);
 }
+
+TEST_F(AudioConfigTest, TestParcelWithoutAmrParams)
+{
+    android::Parcel parcel;
+    AudioConfig configWrite;
+
+    configWrite.setMediaDirection(kMediaDirection);
+    configWrite.setRemoteAddress(kRemoteAddress);
+    configWrite.setRemotePort(kRemotePort);
+    configWrite.setRtcpConfig(rtcp);
+    configWrite.setDscp(kDscp);
+    configWrite.setRxPayloadTypeNumber(kRxPayload);
+    configWrite.setTxPayloadTypeNumber(kTxPayload);
+    configWrite.setSamplingRateKHz(kSamplingRate);
+    configWrite.setPtimeMillis(kPTimeMillis);
+    configWrite.setMaxPtimeMillis(kMaxPtimeMillis);
+    configWrite.setDtxEnabled(kDtxEnabled);
+    configWrite.setCodecType(kCodecType);
+    configWrite.setTxDtmfPayloadTypeNumber(kDtmfPayloadTypeNumber);
+    configWrite.setRxDtmfPayloadTypeNumber(kDtmfPayloadTypeNumber);
+    configWrite.setDtmfsamplingRateKHz(kDtmfsamplingRateKHz);
+    configWrite.setEvsParams(evs);
+    configWrite.writeToParcel(&parcel);
+    parcel.setDataPosition(0);
+
+    AudioConfig configRead;
+    configRead.readFromParcel(&parcel);
+
+    EXPECT_EQ(configRead, configWrite);
+    EXPECT_EQ(configRead.getAmrParams().getAmrMode(), 0);
+    EXPECT_EQ(configRead.getAmrParams().getOctetAligned(), false);
+    EXPECT_EQ(configRead.getAmrParams().getMaxRedundancyMillis(), 0);
+}
+
+TEST_F(AudioConfigTest, TestParcelWithoutEvsParams)
+{
+    android::Parcel parcel;
+    AudioConfig configWrite;
+
+    configWrite.setMediaDirection(kMediaDirection);
+    configWrite.setRemoteAddress(kRemoteAddress);
+    configWrite.setRemotePort(kRemotePort);
+    configWrite.setRtcpConfig(rtcp);
+    configWrite.setDscp(kDscp);
+    configWrite.setRxPayloadTypeNumber(kRxPayload);
+    configWrite.setTxPayloadTypeNumber(kTxPayload);
+    configWrite.setSamplingRateKHz(kSamplingRate);
+    configWrite.setPtimeMillis(kPTimeMillis);
+    configWrite.setMaxPtimeMillis(kMaxPtimeMillis);
+    configWrite.setDtxEnabled(kDtxEnabled);
+    configWrite.setCodecType(kCodecType);
+    configWrite.setTxDtmfPayloadTypeNumber(kDtmfPayloadTypeNumber);
+    configWrite.setRxDtmfPayloadTypeNumber(kDtmfPayloadTypeNumber);
+    configWrite.setDtmfsamplingRateKHz(kDtmfsamplingRateKHz);
+    configWrite.setAmrParams(amr);
+    configWrite.writeToParcel(&parcel);
+    parcel.setDataPosition(0);
+
+    AudioConfig configRead;
+    configRead.readFromParcel(&parcel);
+
+    EXPECT_EQ(configRead, configWrite);
+    EXPECT_EQ(configRead.getEvsParams().getEvsBandwidth(), EvsParams::EVS_BAND_NONE);
+    EXPECT_EQ(configRead.getEvsParams().getEvsMode(), 0);
+    EXPECT_EQ(configRead.getEvsParams().getChannelAwareMode(), 0);
+    EXPECT_EQ(configRead.getEvsParams().getUseHeaderFullOnly(), false);
+    EXPECT_EQ(configRead.getEvsParams().getCodecModeRequest(), 0);
+}
diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java
index 8d33b689..0c090557 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/AudioOffloadTest.java
@@ -415,6 +415,7 @@ public class AudioOffloadTest {
         }
     }
 
+    @Test
     public void testCallQualityChangedInd() {
         final android.hardware.radio.ims.media.CallQuality inputCallQuality =
                 CallQualityTest.createHalCallQuality();
diff --git a/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java b/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java
index 1ad31ce8..8d4addde 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/AudioSessionTest.java
@@ -285,7 +285,7 @@ public class AudioSessionTest {
     @Test
     public void testPacketLossInd() {
         // Receive Packet Loss
-        Utils.sendMessage(handler, AudioSession.EVENT_PACKET_LOSS_IND, PACKET_LOSS);
+        Utils.sendMessage(handler, AudioSession.EVENT_PACKET_LOSS_IND, PACKET_LOSS, UNUSED);
         processAllMessages();
         try {
             verify(callback, times(1)).notifyPacketLoss(eq(PACKET_LOSS));
@@ -297,7 +297,7 @@ public class AudioSessionTest {
     @Test
     public void testJitterInd() {
         // Receive Jitter Indication
-        Utils.sendMessage(handler, AudioSession.EVENT_JITTER_IND, JITTER);
+        Utils.sendMessage(handler, AudioSession.EVENT_JITTER_IND, JITTER, UNUSED);
         processAllMessages();
         try {
             verify(callback, times(1)).notifyJitter(eq(JITTER));
diff --git a/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java b/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java
index 0a8f31ec..7f69e95c 100644
--- a/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java
+++ b/tests/unit/src/com/android/telephony/imsmedia/VideoSessionTest.java
@@ -290,7 +290,7 @@ public class VideoSessionTest {
     @Test
     public void testPacketLossInd() {
         // Receive Packet Loss
-        Utils.sendMessage(mHandler, VideoSession.EVENT_PACKET_LOSS_IND, PACKET_LOSS);
+        Utils.sendMessage(mHandler, VideoSession.EVENT_PACKET_LOSS_IND, PACKET_LOSS, UNUSED);
         processAllMessages();
         try {
             verify(mCallback, times(1)).notifyPacketLoss(eq(PACKET_LOSS));