Fix the manual code review

Use nullptr instead of NULL

Bug: 260305828
Test: atest ImsMediaNativeTests
Change-Id: I3a327830092f2d9310fd138e4a03abc764a3bc06

28 files changed, 144 insertions, 145 deletions

diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtcpTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtcpTest.cpp
index c4d41e35..895f19ce 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtcpTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtcpTest.cpp
@@ -63,7 +63,7 @@ class AudioStreamGraphRtcpTest : public ::testing::Test
 public:
     AudioStreamGraphRtcpTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtcpFd = -1;
     }
     virtual ~AudioStreamGraphRtcpTest() {}
@@ -119,12 +119,12 @@ protected:
         socketRtcpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtcpFd, -1);
 
-        graph = new AudioStreamGraphRtcp(NULL, socketRtcpFd);
+        graph = new AudioStreamGraphRtcp(nullptr, socketRtcpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpRxTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpRxTest.cpp
index 378f5136..4f8cd554 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpRxTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpRxTest.cpp
@@ -63,7 +63,7 @@ class AudioStreamGraphRtpRxTest : public ::testing::Test
 public:
     AudioStreamGraphRtpRxTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtpFd = -1;
     }
     ~AudioStreamGraphRtpRxTest() {}
@@ -119,12 +119,12 @@ protected:
         socketRtpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtpFd, -1);
 
-        graph = new AudioStreamGraphRtpRx(NULL, socketRtpFd);
+        graph = new AudioStreamGraphRtpRx(nullptr, socketRtpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpTxTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpTxTest.cpp
index 6e043432..37a697c8 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpTxTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioStreamGraphRtpTxTest.cpp
@@ -80,7 +80,7 @@ class AudioStreamGraphRtpTxTest : public ::testing::Test
 public:
     AudioStreamGraphRtpTxTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtpFd = -1;
     }
     ~AudioStreamGraphRtpTxTest() {}
@@ -133,12 +133,12 @@ protected:
         socketRtpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtpFd, -1);
 
-        graph = new AudioStreamGraphRtpTx(NULL, socketRtpFd);
+        graph = new AudioStreamGraphRtpTx(nullptr, socketRtpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/MediaQualityAnalyzerTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/MediaQualityAnalyzerTest.cpp
index 1c5b3425..c0d7b2ea 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/MediaQualityAnalyzerTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/MediaQualityAnalyzerTest.cpp
@@ -76,7 +76,7 @@ public:
         {
             MediaQuality* quality = reinterpret_cast<MediaQuality*>(param1);
 
-            if (quality != NULL)
+            if (quality != nullptr)
             {
                 mMediaQuality = *quality;
                 delete quality;
@@ -100,7 +100,7 @@ private:
 class MediaQualityAnalyzerTest : public ::testing::Test
 {
 public:
-    MediaQualityAnalyzerTest() { mAnalyzer = NULL; }
+    MediaQualityAnalyzerTest() { mAnalyzer = nullptr; }
     virtual ~MediaQualityAnalyzerTest() {}
 
 protected:
@@ -159,7 +159,7 @@ protected:
 
     virtual void TearDown() override
     {
-        if (mAnalyzer != NULL)
+        if (mAnalyzer != nullptr)
         {
             delete mAnalyzer;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/node/ImsMediaAudioTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/node/ImsMediaAudioTest.cpp
index 22a1080b..4dddf282 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/node/ImsMediaAudioTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/node/ImsMediaAudioTest.cpp
@@ -94,17 +94,17 @@ protected:
 
     virtual void TearDown() override
     {
-        if (audioSource != NULL)
+        if (audioSource != nullptr)
         {
             delete audioSource;
         }
 
-        if (audioPlayer != NULL)
+        if (audioPlayer != nullptr)
         {
             delete audioPlayer;
         }
 
-        if (mockAudioCallback != NULL)
+        if (mockAudioCallback != nullptr)
         {
             delete mockAudioCallback;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtcpTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtcpTest.cpp
index 51d1cba5..4436e429 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtcpTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtcpTest.cpp
@@ -50,7 +50,7 @@ class TextStreamGraphRtcpTest : public ::testing::Test
 public:
     TextStreamGraphRtcpTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtcpFd = -1;
     }
     virtual ~TextStreamGraphRtcpTest() {}
@@ -88,12 +88,12 @@ protected:
         socketRtcpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtcpFd, -1);
 
-        graph = new TextStreamGraphRtcp(NULL, socketRtcpFd);
+        graph = new TextStreamGraphRtcp(nullptr, socketRtcpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpRxTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpRxTest.cpp
index f9e7c001..37641bcb 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpRxTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpRxTest.cpp
@@ -50,7 +50,7 @@ class TextStreamGraphRtpRxTest : public ::testing::Test
 public:
     TextStreamGraphRtpRxTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtpFd = -1;
     }
     virtual ~TextStreamGraphRtpRxTest() {}
@@ -88,12 +88,12 @@ protected:
         socketRtpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtpFd, -1);
 
-        graph = new TextStreamGraphRtpRx(NULL, socketRtpFd);
+        graph = new TextStreamGraphRtpRx(nullptr, socketRtpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpTxTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpTxTest.cpp
index 4ffa4880..fb3c0469 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpTxTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/TextStreamGraphRtpTxTest.cpp
@@ -50,7 +50,7 @@ class TextStreamGraphRtpTxTest : public ::testing::Test
 public:
     TextStreamGraphRtpTxTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtpFd = -1;
     }
     virtual ~TextStreamGraphRtpTxTest() {}
@@ -86,12 +86,12 @@ protected:
         unsigned int testPort = 30000;
         socketRtpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtpFd, -1);
-        graph = new TextStreamGraphRtpTx(NULL, socketRtpFd);
+        graph = new TextStreamGraphRtpTx(nullptr, socketRtpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRendererNodeTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRendererNodeTest.cpp
index d7dfb5c6..19a73254 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRendererNodeTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/text/nodes/TextRendererNodeTest.cpp
@@ -82,8 +82,8 @@ class TextRendererNodeTest : public ::testing::Test
 public:
     TextRendererNodeTest()
     {
-        mFakeCallback = NULL;
-        mNode = NULL;
+        mFakeCallback = nullptr;
+        mNode = nullptr;
         memset(mTempBuffer, 0, sizeof(mTempBuffer));
     }
     virtual ~TextRendererNodeTest() {}
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtcpTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtcpTest.cpp
index 07896d2c..754b7dee 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtcpTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtcpTest.cpp
@@ -64,7 +64,7 @@ class VideoStreamGraphRtcpTest : public ::testing::Test
 public:
     VideoStreamGraphRtcpTest()
     {
-        graph = NULL;
+        graph = nullptr;
         socketRtcpFd = -1;
     }
     virtual ~VideoStreamGraphRtcpTest() {}
@@ -114,12 +114,12 @@ protected:
         socketRtcpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtcpFd, -1);
 
-        graph = new VideoStreamGraphRtcp(NULL, socketRtcpFd);
+        graph = new VideoStreamGraphRtcp(nullptr, socketRtcpFd);
     }
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpRxTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpRxTest.cpp
index 11a76dbe..84c75a8c 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpRxTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpRxTest.cpp
@@ -63,9 +63,9 @@ class VideoStreamGraphRtpRxTest : public ::testing::Test
 public:
     VideoStreamGraphRtpRxTest()
     {
-        graph = NULL;
-        displayReader = NULL;
-        displaySurface = NULL;
+        graph = nullptr;
+        displayReader = nullptr;
+        displaySurface = nullptr;
         socketRtpFd = -1;
     }
     virtual ~VideoStreamGraphRtpRxTest() {}
@@ -117,7 +117,7 @@ protected:
         socketRtpFd = ImsMediaNetworkUtil::openSocket(testIp, testPort, AF_INET);
         EXPECT_NE(socketRtpFd, -1);
 
-        graph = new VideoStreamGraphRtpRx(NULL, socketRtpFd);
+        graph = new VideoStreamGraphRtpRx(nullptr, socketRtpFd);
 
         EXPECT_EQ(AImageReader_new(kResolutionWidth, kResolutionHeight, AIMAGE_FORMAT_YUV_420_888,
                           1, &displayReader),
@@ -127,7 +127,7 @@ protected:
 
     virtual void TearDown() override
     {
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
@@ -137,7 +137,7 @@ protected:
             ImsMediaNetworkUtil::closeSocket(socketRtpFd);
         }
 
-        if (displayReader != NULL)
+        if (displayReader != nullptr)
         {
             AImageReader_delete(displayReader);
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpTxTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpTxTest.cpp
index c3ec97b3..9118864a 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpTxTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/video/VideoStreamGraphRtpTxTest.cpp
@@ -63,9 +63,9 @@ class VideoStreamGraphRtpTxTest : public ::testing::Test
 public:
     VideoStreamGraphRtpTxTest()
     {
-        graph = NULL;
-        previewReader = NULL;
-        previewSurface = NULL;
+        graph = nullptr;
+        previewReader = nullptr;
+        previewSurface = nullptr;
         socketRtpFd = -1;
     }
     virtual ~VideoStreamGraphRtpTxTest() {}
@@ -131,12 +131,12 @@ protected:
             ImsMediaNetworkUtil::closeSocket(socketRtpFd);
         }
 
-        if (previewReader != NULL)
+        if (previewReader != nullptr)
         {
             AImageReader_delete(previewReader);
         }
 
-        if (graph != NULL)
+        if (graph != nullptr)
         {
             delete graph;
         }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/MockBaseNode.h b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/MockBaseNode.h
index 6c1618a8..42169f06 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/MockBaseNode.h
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/MockBaseNode.h
@@ -23,7 +23,7 @@
 class MockBaseNode : public BaseNode
 {
 public:
-    MockBaseNode(BaseSessionCallback* callback = NULL) :
+    MockBaseNode(BaseSessionCallback* callback = nullptr) :
             BaseNode(callback)
     {
     }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpAppPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpAppPacketTest.cpp
index 4c9ac79b..894da49f 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpAppPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpAppPacketTest.cpp
@@ -48,7 +48,7 @@ protected:
 TEST_F(RtcpAppPacketTest, decodeAppPacketSuccess)
 {
     std::unique_ptr<RtpDt_UChar[]> pucAppBuf(new RtpDt_UChar[14]);
-    ASSERT_TRUE(pucAppBuf != RTP_NULL);
+    ASSERT_TRUE(pucAppBuf != nullptr);
 
     memcpy(pucAppBuf.get(),
             (RtpDt_UChar[]){0x80, 0xCC, 0x00, 0x07, 0x19, 0x6D, 0x27, 0xC5, 0x2B, 0x67, 0x01}, 13);
@@ -59,7 +59,7 @@ TEST_F(RtcpAppPacketTest, decodeAppPacketSuccess)
 TEST_F(RtcpAppPacketTest, decodeAppPacketBoundaryLength)
 {
     std::unique_ptr<RtpDt_UChar[]> pucAppBuf(new RtpDt_UChar[14]);
-    ASSERT_TRUE(pucAppBuf != RTP_NULL);
+    ASSERT_TRUE(pucAppBuf != nullptr);
 
     memcpy(pucAppBuf.get(),
             (RtpDt_UChar[]){0x80, 0xCC, 0x00, 0x07, 0x19, 0x6D, 0x27, 0xC5, 0x2B, 0x67}, 12);
@@ -70,7 +70,7 @@ TEST_F(RtcpAppPacketTest, decodeAppPacketBoundaryLength)
 TEST_F(RtcpAppPacketTest, decodeAppPacketUnderBoundaryLength)
 {
     std::unique_ptr<RtpDt_UChar[]> pucAppBuf(new RtpDt_UChar[14]);
-    ASSERT_TRUE(pucAppBuf != RTP_NULL);
+    ASSERT_TRUE(pucAppBuf != nullptr);
 
     memcpy(pucAppBuf.get(), (RtpDt_UChar[]){0x80, 0xCC, 0x00, 0x07, 0x19, 0x6D, 0x27, 0xC5, 0x2B},
             11);
@@ -85,7 +85,7 @@ TEST_F(RtcpAppPacketTest, formAppPacketSuccessTest)
 
     std::unique_ptr<RtpDt_UChar[]> pcBuff(new RtpDt_UChar[RTP_DEF_MTU_SIZE]);
 
-    ASSERT_TRUE(pcBuff != RTP_NULL);
+    ASSERT_TRUE(pcBuff != nullptr);
 
     testBuf->setBufferInfo(RTP_DEF_MTU_SIZE, pcBuff.release());
     testBuf->setLength(RTP_ZERO);
@@ -110,7 +110,7 @@ TEST_F(RtcpAppPacketTest, formAppPacketBufferOverflowTest)
 
     std::unique_ptr<RtpDt_UChar[]> pcBuff(new RtpDt_UChar[RTP_DEF_MTU_SIZE]);
 
-    ASSERT_TRUE(pcBuff != RTP_NULL);
+    ASSERT_TRUE(pcBuff != nullptr);
 
     testBuf->setBufferInfo(RTP_DEF_MTU_SIZE, pcBuff.release());
     testBuf->setLength(RTP_DEF_MTU_SIZE);
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpByePacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpByePacketTest.cpp
index 9c1d3f15..5189edf2 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpByePacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpByePacketTest.cpp
@@ -48,7 +48,7 @@ protected:
 TEST_F(RtcpByePacketTest, decodeByePacketMultipleSSRCTest)
 {
     std::unique_ptr<RtpDt_UChar[]> pucByeBuf(new RtpDt_UChar[25]);
-    ASSERT_TRUE(pucByeBuf != NULL);
+    ASSERT_TRUE(pucByeBuf != nullptr);
 
     /* pucByeBuf injected with multiple ssrc number */
     memcpy(pucByeBuf.get(),
@@ -63,7 +63,7 @@ TEST_F(RtcpByePacketTest, decodeByePacketMultipleSSRCTest)
 TEST_F(RtcpByePacketTest, decodeByePacketSingleSSRCTest)
 {
     std::unique_ptr<RtpDt_UChar[]> pucByeBuf(new RtpDt_UChar[13]);
-    ASSERT_TRUE(pucByeBuf != RTP_NULL);
+    ASSERT_TRUE(pucByeBuf != nullptr);
 
     /* pucByeBuf contains session RTCP Header, Optional reason and length excluded */
     memcpy(pucByeBuf.get(),
@@ -77,7 +77,7 @@ TEST_F(RtcpByePacketTest, decodeByePacketSingleSSRCTest)
 TEST_F(RtcpByePacketTest, decodeByePacketMultipleSSRCOptionalDataTest)
 {
     std::unique_ptr<RtpDt_UChar[]> pucByeBuf(new RtpDt_UChar[28]);
-    ASSERT_TRUE(pucByeBuf != RTP_NULL);
+    ASSERT_TRUE(pucByeBuf != nullptr);
 
     /* pucByeBuf contains RTCP header, 2 SSRC and optional Length and Reason. */
     memcpy(pucByeBuf.get(),
@@ -92,7 +92,7 @@ TEST_F(RtcpByePacketTest, decodeByePacketMultipleSSRCOptionalDataTest)
 TEST_F(RtcpByePacketTest, decodeByePacketReasonLengthOverflowTest)
 {
     std::unique_ptr<RtpDt_UChar[]> pucByeBuf(new RtpDt_UChar[28]);
-    ASSERT_TRUE(pucByeBuf != RTP_NULL);
+    ASSERT_TRUE(pucByeBuf != nullptr);
 
     /* pucByeBuf injected with unexpected Optiona length value, how ever
      * optional message having less length */
@@ -108,7 +108,7 @@ TEST_F(RtcpByePacketTest, decodeByePacketReasonLengthOverflowTest)
 TEST_F(RtcpByePacketTest, decodeByePacketReasonLengthUnderflowTest)
 {
     std::unique_ptr<RtpDt_UChar[]> pucByeBuf(new RtpDt_UChar[28]);
-    ASSERT_TRUE(pucByeBuf != RTP_NULL);
+    ASSERT_TRUE(pucByeBuf != nullptr);
 
     /* pucByeBuf injected with unexpected Optiona length value, how ever
      * optional message having more length */
@@ -123,11 +123,11 @@ TEST_F(RtcpByePacketTest, decodeByePacketReasonLengthUnderflowTest)
 TEST_F(RtcpByePacketTest, formByePacketSuccessTest)
 {
     std::unique_ptr<RtpBuffer> testBuf(new RtpBuffer());
-    ASSERT_TRUE(testBuf != RTP_NULL);
+    ASSERT_TRUE(testBuf != nullptr);
 
     std::unique_ptr<RtpDt_UChar[]> pcBuff(new RtpDt_UChar[RTP_DEF_MTU_SIZE]);
 
-    ASSERT_TRUE(pcBuff != RTP_NULL);
+    ASSERT_TRUE(pcBuff != nullptr);
 
     testBuf->setBufferInfo(RTP_DEF_MTU_SIZE, pcBuff.release());
     testBuf->setLength(RTP_ZERO);
@@ -141,11 +141,11 @@ TEST_F(RtcpByePacketTest, formByePacketSuccessTest)
 TEST_F(RtcpByePacketTest, formByePacketSuccessTestWithByeReason)
 {
     std::unique_ptr<RtpBuffer> testBuf(new RtpBuffer());
-    ASSERT_TRUE(testBuf != RTP_NULL);
+    ASSERT_TRUE(testBuf != nullptr);
 
     std::unique_ptr<RtpDt_UChar[]> pcBuff(new RtpDt_UChar[RTP_DEF_MTU_SIZE]);
 
-    ASSERT_TRUE(pcBuff != RTP_NULL);
+    ASSERT_TRUE(pcBuff != nullptr);
 
     testBuf->setBufferInfo(RTP_DEF_MTU_SIZE, pcBuff.release());
     testBuf->setLength(RTP_ZERO);
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpChunkTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpChunkTest.cpp
index 5e401129..5b2ece14 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpChunkTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpChunkTest.cpp
@@ -54,7 +54,7 @@ TEST_F(RtcpChunkTest, decodeChunkItem)
     chunkItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[chunkItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", chunkItem->ucLength);
 
@@ -110,7 +110,7 @@ TEST_F(RtcpChunkTest, decodeMultichunkItem)
     chunkItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[chunkItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", chunkItem->ucLength);
 
@@ -127,7 +127,7 @@ TEST_F(RtcpChunkTest, decodeMultichunkItem)
     chunkItemSec->ucType = 1;
     chunkItemSec->ucLength = 18;
 
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "google@example.com", chunkItemSec->ucLength);
 
@@ -175,7 +175,7 @@ TEST_F(RtcpChunkTest, decodeSdesChunkWithInvalidType)
     chunkItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[chunkItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", chunkItem->ucLength);
 
@@ -192,7 +192,7 @@ TEST_F(RtcpChunkTest, decodeSdesChunkWithInvalidType)
     chunkItemSec->ucType = 2;
     chunkItemSec->ucLength = 18;
 
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "google@example.com", chunkItemSec->ucLength);
 
@@ -242,7 +242,7 @@ TEST_F(RtcpChunkTest, decodeSdesChunkWithInvalidLength)
     chunkItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[chunkItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", chunkItem->ucLength);
 
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpFbPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpFbPacketTest.cpp
index ffc6879a..42025ea4 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpFbPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpFbPacketTest.cpp
@@ -26,7 +26,7 @@ TEST(RtcpFbPacketTest, TestGetSetMethods)
     objRtcpHeader.decodeRtcpHeader(pRtcpBuff, sizeof(pRtcpBuff));
     objRtcpFbPacket.setRtcpHdrInfo(objRtcpHeader);
     RtcpHeader* pRet = objRtcpFbPacket.getRtcpHdrInfo();
-    ASSERT_TRUE(pRet != NULL);
+    ASSERT_TRUE(pRet != nullptr);
     EXPECT_EQ(*pRet, objRtcpHeader);
 
     objRtcpFbPacket.setSsrc(0xAAAAAAAA);
@@ -39,7 +39,7 @@ TEST(RtcpFbPacketTest, TestGetSetMethods)
     objRtcpFbPacket.setFCI(new RtpBuffer(sizeof(testFci), testFci));
     RtpBuffer* pRtpBuf = objRtcpFbPacket.getFCI();
 
-    ASSERT_TRUE(pRtpBuf != NULL);
+    ASSERT_TRUE(pRtpBuf != nullptr);
     EXPECT_EQ(memcmp(pRtpBuf->getBuffer(), testFci, sizeof(testFci)), 0);
 
     objRtcpFbPacket.setPayloadType(RTCP_RTPFB);
@@ -60,7 +60,7 @@ TEST(RtcpFbPacketTest, TestDecodeFbPacket)
     EXPECT_EQ(res, RTP_SUCCESS);
     EXPECT_EQ(objRtcpFbPacket.getMediaSsrc(), 0xb1c8cb03);
     RtpBuffer* pRtpBuf = objRtcpFbPacket.getFCI();
-    ASSERT_TRUE(pRtpBuf != NULL);
+    ASSERT_TRUE(pRtpBuf != nullptr);
     EXPECT_EQ(memcmp(pRtpBuf->getBuffer(), (bufPacket + RTP_WORD_SIZE),
                       (sizeof(bufPacket) - RTP_WORD_SIZE)),
             0);
@@ -68,7 +68,7 @@ TEST(RtcpFbPacketTest, TestDecodeFbPacket)
 
 TEST(RtcpFbPacketTest, TestEncodeRtcpRTPFB)
 {
-    RtpBuffer objRtcpPktBuf(64, NULL);
+    RtpBuffer objRtcpPktBuf(64, nullptr);
     objRtcpPktBuf.setLength(0);
     RtcpFbPacket objRtcpFbPacket;
 
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpHeaderTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpHeaderTest.cpp
index b88e60d8..fb5c6e35 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpHeaderTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpHeaderTest.cpp
@@ -149,7 +149,7 @@ TEST_F(RtcpHeaderTest, TestFormRtcpHeader)
     rtcpHeader.setPacketType(200);
     rtcpHeader.setLength(28);
     rtcpHeader.setSsrc(0xFFFFFFFF);
-    RtpBuffer rtpBuffer(16, NULL);
+    RtpBuffer rtpBuffer(16, nullptr);
     rtpBuffer.setLength(0);
     rtcpHeader.formRtcpHeader(&rtpBuffer);
 
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpPacketTest.cpp
index 7925c035..bb90ee84 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpPacketTest.cpp
@@ -85,10 +85,10 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrSdesPacket)
     ASSERT_TRUE(SrList.size() != 0);
 
     RtcpSrPacket* rtcpSrPacket = SrList.front();
-    ASSERT_TRUE(rtcpSrPacket != NULL);
+    ASSERT_TRUE(rtcpSrPacket != nullptr);
 
     RtcpHeader* pRtcpHeader = rtcpSrPacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -98,7 +98,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrSdesPacket)
     EXPECT_EQ(pRtcpHeader->getSsrc(), 0xb1c8cb02);
 
     tRTP_NTP_TIME* ntpTime = rtcpSrPacket->getNtpTime();
-    ASSERT_TRUE(ntpTime != NULL);
+    ASSERT_TRUE(ntpTime != nullptr);
 
     EXPECT_EQ(ntpTime->m_uiNtpHigh32Bits, 0xe65fa531);
     EXPECT_EQ(ntpTime->m_uiNtpLow32Bits, 0x539124c2);
@@ -107,17 +107,17 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrSdesPacket)
     EXPECT_EQ(rtcpSrPacket->getSendOctetCount(), 0x0000c853);
 
     RtcpSdesPacket* pRtcpSdesPacket = rtcpPacket.getSdesPacket();
-    ASSERT_TRUE(pRtcpSdesPacket != NULL);
+    ASSERT_TRUE(pRtcpSdesPacket != nullptr);
 
     std::list<RtcpChunk*> pSdesChunks = pRtcpSdesPacket->getSdesChunkList();
     EXPECT_EQ(pSdesChunks.size(), 1);
     RtcpChunk* chunk = pSdesChunks.front();
-    ASSERT_TRUE(chunk != NULL);
+    ASSERT_TRUE(chunk != nullptr);
 
     std::list<tRTCP_SDES_ITEM*> sdesItemList = chunk->getSdesItemList();
     EXPECT_EQ(sdesItemList.size(), 1);
     tRTCP_SDES_ITEM* sdesItem = sdesItemList.front();
-    ASSERT_TRUE(sdesItem != NULL);
+    ASSERT_TRUE(sdesItem != nullptr);
 
     EXPECT_EQ(sdesItem->ucType, 1);
     EXPECT_EQ(sdesItem->ucLength, 31);
@@ -127,7 +127,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrSdesPacket)
             0);
 
     pRtcpHeader = pRtcpSdesPacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -208,10 +208,10 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrPacket)
     ASSERT_TRUE(SrList.size() != 0);
 
     RtcpSrPacket* rtcpSrPacket = SrList.front();
-    ASSERT_TRUE(rtcpSrPacket != NULL);
+    ASSERT_TRUE(rtcpSrPacket != nullptr);
 
     RtcpHeader* pRtcpHeader = rtcpSrPacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -221,7 +221,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrPacket)
     EXPECT_EQ(pRtcpHeader->getSsrc(), 0xd2bd4e3e);
 
     tRTP_NTP_TIME* ntpTime = rtcpSrPacket->getNtpTime();
-    ASSERT_TRUE(ntpTime != NULL);
+    ASSERT_TRUE(ntpTime != nullptr);
 
     EXPECT_EQ(ntpTime->m_uiNtpHigh32Bits, 3314714324);
     EXPECT_EQ(ntpTime->m_uiNtpLow32Bits, 3874060501);
@@ -230,13 +230,13 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrPacket)
     EXPECT_EQ(rtcpSrPacket->getSendOctetCount(), 320);
 
     RtcpRrPacket* pRRInfo = rtcpSrPacket->getRrPktInfo();
-    ASSERT_TRUE(pRRInfo != NULL);
+    ASSERT_TRUE(pRRInfo != nullptr);
 
     std::list<RtcpReportBlock*> reports = pRRInfo->getReportBlockList();
     ASSERT_TRUE(reports.size() != 0);
 
     RtcpReportBlock* report = reports.front();
-    ASSERT_TRUE(report != NULL);
+    ASSERT_TRUE(report != nullptr);
 
     EXPECT_EQ(report->getSsrc(), 0xd2bd4e3e);
     EXPECT_EQ((int)report->getFracLost(), 0x10);
@@ -251,10 +251,10 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrPacket)
     ASSERT_TRUE(RrList.size() != 0);
 
     RtcpRrPacket* pRrPkt = RrList.front();
-    ASSERT_TRUE(pRrPkt != NULL);
+    ASSERT_TRUE(pRrPkt != nullptr);
 
     pRtcpHeader = pRrPkt->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -267,7 +267,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrPacket)
     ASSERT_TRUE(reports.size() != 0);
 
     report = reports.front();
-    ASSERT_TRUE(report != NULL);
+    ASSERT_TRUE(report != nullptr);
 
     EXPECT_EQ(report->getSsrc(), 0);
     EXPECT_EQ((int)report->getFracLost(), 0);
@@ -365,10 +365,10 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
     ASSERT_TRUE(SrList.size() != 0);
 
     RtcpSrPacket* rtcpSrPacket = SrList.front();
-    ASSERT_TRUE(rtcpSrPacket != NULL);
+    ASSERT_TRUE(rtcpSrPacket != nullptr);
 
     RtcpHeader* pRtcpHeader = rtcpSrPacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -378,7 +378,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
     EXPECT_EQ(pRtcpHeader->getSsrc(), 0xd2bd4e3e);
 
     tRTP_NTP_TIME* ntpTime = rtcpSrPacket->getNtpTime();
-    ASSERT_TRUE(ntpTime != NULL);
+    ASSERT_TRUE(ntpTime != nullptr);
 
     EXPECT_EQ(ntpTime->m_uiNtpHigh32Bits, 3314714324);
     EXPECT_EQ(ntpTime->m_uiNtpLow32Bits, 4131758539);
@@ -387,13 +387,13 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
     EXPECT_EQ(rtcpSrPacket->getSendOctetCount(), 640);
 
     RtcpRrPacket* pRRInfo = rtcpSrPacket->getRrPktInfo();
-    ASSERT_TRUE(pRRInfo != NULL);
+    ASSERT_TRUE(pRRInfo != nullptr);
 
     std::list<RtcpReportBlock*> reports = pRRInfo->getReportBlockList();
     ASSERT_TRUE(reports.size() != 0);
 
     RtcpReportBlock* report = reports.front();
-    ASSERT_TRUE(report != NULL);
+    ASSERT_TRUE(report != nullptr);
 
     EXPECT_EQ(report->getSsrc(), 0xd2bd4e3e);
     EXPECT_EQ((int)report->getFracLost(), 0);
@@ -408,10 +408,10 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
     ASSERT_TRUE(RrList.size() != 0);
 
     RtcpRrPacket* pRrPkt = RrList.front();
-    ASSERT_TRUE(pRrPkt != NULL);
+    ASSERT_TRUE(pRrPkt != nullptr);
 
     pRtcpHeader = pRrPkt->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -424,7 +424,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
     ASSERT_TRUE(reports.size() != 0);
 
     report = reports.front();
-    ASSERT_TRUE(report != NULL);
+    ASSERT_TRUE(report != nullptr);
 
     EXPECT_EQ(report->getSsrc(), 0x58f33dea);
     EXPECT_EQ((int)report->getFracLost(), 0);
@@ -436,17 +436,17 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
 
     // Check SDES
     RtcpSdesPacket* pRtcpSdesPacket = rtcpPacket.getSdesPacket();
-    ASSERT_TRUE(pRtcpSdesPacket != NULL);
+    ASSERT_TRUE(pRtcpSdesPacket != nullptr);
 
     std::list<RtcpChunk*> pSdesChunks = pRtcpSdesPacket->getSdesChunkList();
     EXPECT_EQ(pSdesChunks.size(), 1);
     RtcpChunk* chunk = pSdesChunks.front();
-    ASSERT_TRUE(chunk != NULL);
+    ASSERT_TRUE(chunk != nullptr);
 
     std::list<tRTCP_SDES_ITEM*> sdesItemList = chunk->getSdesItemList();
     EXPECT_EQ(sdesItemList.size(), 1);
     tRTCP_SDES_ITEM* sdesItem = sdesItemList.front();
-    ASSERT_TRUE(sdesItem != NULL);
+    ASSERT_TRUE(sdesItem != nullptr);
 
     EXPECT_EQ(sdesItem->ucType, 1);
     EXPECT_EQ(sdesItem->ucLength, 20);
@@ -456,7 +456,7 @@ TEST_F(RtcpPacketTest, DecodeCompoundSrRrSdesPacket)
             0);
 
     pRtcpHeader = pRtcpSdesPacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -497,10 +497,10 @@ TEST_F(RtcpPacketTest, TestDecodeByePacket)
     EXPECT_EQ(res, RTP_SUCCESS);
 
     RtcpByePacket* pByePacket = rtcpPacket.getByePacket();
-    ASSERT_TRUE(pByePacket != NULL);
+    ASSERT_TRUE(pByePacket != nullptr);
 
     RtcpHeader* pRtcpHeader = pByePacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_TRUE);
@@ -516,7 +516,7 @@ TEST_F(RtcpPacketTest, TestDecodeByePacket)
     EXPECT_EQ(*ssrcList.front(), (RtpDt_UInt32)0xb1c8cb04);
 
     RtpBuffer* reason = pByePacket->getReason();
-    ASSERT_TRUE(reason != NULL);
+    ASSERT_TRUE(reason != nullptr);
 
     EXPECT_EQ(reason->getLength(), 8);
     EXPECT_EQ(strcmp(reinterpret_cast<char*>(reason->getBuffer()),
@@ -553,10 +553,10 @@ TEST_F(RtcpPacketTest, TestDecodeAppPacket)
     EXPECT_EQ(res, RTP_SUCCESS);
 
     RtcpAppPacket* pAppPacket = rtcpPacket.getAppPacket();
-    ASSERT_TRUE(pAppPacket != NULL);
+    ASSERT_TRUE(pAppPacket != nullptr);
 
     RtcpHeader* pRtcpHeader = pAppPacket->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -568,7 +568,7 @@ TEST_F(RtcpPacketTest, TestDecodeAppPacket)
     const char* pktName = "TEST";
     EXPECT_EQ(memcmp(&appPktName, pktName, strlen(pktName)), 0);
     RtpBuffer* pAppData = pAppPacket->getAppData();
-    ASSERT_TRUE(pAppData != NULL);
+    ASSERT_TRUE(pAppData != nullptr);
     const char* appData = "This is a test application data.";
     EXPECT_EQ(memcmp(pAppData->getBuffer(), appData, strlen(appData)), 0);
     EXPECT_EQ(pAppData->getLength(), strlen(appData));
@@ -613,10 +613,10 @@ TEST_F(RtcpPacketTest, TestDecodeFBPacket)
     std::list<RtcpFbPacket*> fbpktList = rtcpPacket.getFbPacketList();
     EXPECT_EQ(fbpktList.size(), 2);
     RtcpFbPacket* fbpkt = fbpktList.front();
-    ASSERT_TRUE(fbpkt != NULL);
+    ASSERT_TRUE(fbpkt != nullptr);
 
     RtcpHeader* pRtcpHeader = fbpkt->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
@@ -628,10 +628,10 @@ TEST_F(RtcpPacketTest, TestDecodeFBPacket)
 
     fbpktList.pop_front();
     fbpkt = fbpktList.front();
-    ASSERT_TRUE(fbpkt != NULL);
+    ASSERT_TRUE(fbpkt != nullptr);
 
     pRtcpHeader = fbpkt->getRtcpHdrInfo();
-    ASSERT_TRUE(pRtcpHeader != NULL);
+    ASSERT_TRUE(pRtcpHeader != nullptr);
 
     EXPECT_EQ(pRtcpHeader->getVersion(), RTP_VERSION_NUM);
     EXPECT_EQ(pRtcpHeader->getPadding(), eRTP_FALSE);
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpReportBlockTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpReportBlockTest.cpp
index b3cc8899..9e5df9b3 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpReportBlockTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpReportBlockTest.cpp
@@ -70,7 +70,7 @@ TEST(RtcpReportBlockTest, TestFormReportBlock)
     objRtcpReportBlock.setLastSR(0x86d4e600);
     objRtcpReportBlock.setDelayLastSR(0x86d4e601);
 
-    RtpBuffer objRtcpPktBuf(64, NULL);
+    RtpBuffer objRtcpPktBuf(64, nullptr);
     objRtcpPktBuf.setLength(0);
     eRtp_Bool res = objRtcpReportBlock.formReportBlock(&objRtcpPktBuf);
     EXPECT_EQ(res, eRTP_SUCCESS);
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpRrPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpRrPacketTest.cpp
index 4a0de8f0..504311ce 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpRrPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpRrPacketTest.cpp
@@ -53,7 +53,7 @@ TEST_F(RtcpRrPacketTest, TestGetSetMethods)
     objRtcpHeader.decodeRtcpHeader(pRtcpBuff, sizeof(pRtcpBuff));
     objRtcpRrPacket.setRtcpHdrInfo(objRtcpHeader);
     RtcpHeader* pRet = objRtcpRrPacket.getRtcpHdrInfo();
-    ASSERT_TRUE(pRet != NULL);
+    ASSERT_TRUE(pRet != nullptr);
     EXPECT_EQ(*pRet, objRtcpHeader);
 
     uint8_t hdrExtBuf[] = {0xe6, 0x5f, 0xa5, 0x31, 0x53, 0x91, 0x24, 0xc2, 0x00, 0x04, 0x01};
@@ -61,11 +61,11 @@ TEST_F(RtcpRrPacketTest, TestGetSetMethods)
     RtpBuffer rtpbuffer(11, hdrExtBuf);
     objRtcpRrPacket.setExtHdrInfo(&rtpbuffer);
     RtpBuffer* pExtBuf = objRtcpRrPacket.getExtHdrInfo();
-    ASSERT_TRUE(pExtBuf != NULL);
+    ASSERT_TRUE(pExtBuf != nullptr);
     EXPECT_EQ(memcmp(rtpbuffer.getBuffer(), pExtBuf->getBuffer(), 11), 0);
     EXPECT_EQ(pExtBuf->getLength(), 11);
 
-    RtpBuffer* pRtpbufferEmpty = new RtpBuffer(0, NULL);
+    RtpBuffer* pRtpbufferEmpty = new RtpBuffer(0, nullptr);
     objRtcpRrPacket.setExtHdrInfo(pRtpbufferEmpty);
 }
 
@@ -80,7 +80,7 @@ TEST_F(RtcpRrPacketTest, TestDecodeRrPacket)
     ASSERT_TRUE(reports.size() != 0);
 
     RtcpReportBlock* report = reports.front();
-    ASSERT_TRUE(report != NULL);
+    ASSERT_TRUE(report != nullptr);
 
     EXPECT_EQ(report->getSsrc(), 0x01020304);
     EXPECT_EQ((int)report->getFracLost(), 0x10);
@@ -94,7 +94,7 @@ TEST_F(RtcpRrPacketTest, TestDecodeRrPacket)
 TEST_F(RtcpRrPacketTest, TestFormRrPacket)
 {
     RtcpRrPacket objRtcpRrPacket;
-    RtpBuffer objRtcpPktBuf(bBufLen, NULL);
+    RtpBuffer objRtcpPktBuf(bBufLen, nullptr);
     objRtcpPktBuf.setLength(0);
     RtcpReportBlock* pobjRtcpReportBlock = new RtcpReportBlock();
     pobjRtcpReportBlock->setSsrc(0x01020304);
@@ -111,4 +111,4 @@ TEST_F(RtcpRrPacketTest, TestFormRrPacket)
     EXPECT_EQ(memcmp(objRtcpPktBuf.getBuffer(), RtcpRrPacketTest::bufRrWithOneReport, bBufLen), 0);
 }
 
-//TODO: Add test case for RTCP extension headers.
\ No newline at end of file
+// TODO: Add test case for RTCP extension headers.
\ No newline at end of file
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSdesPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSdesPacketTest.cpp
index f01b0326..00346eb4 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSdesPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSdesPacketTest.cpp
@@ -55,7 +55,7 @@ TEST_F(RtcpSdesPacketTest, decodeSdesPacketSingleSdesItem)
     sdesItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[sdesItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", sdesItem->ucLength);
 
@@ -117,7 +117,7 @@ TEST_F(RtcpSdesPacketTest, decodeSdesPacketMultiSdesItem)
     sdesItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[sdesItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", sdesItem->ucLength);
 
@@ -133,7 +133,7 @@ TEST_F(RtcpSdesPacketTest, decodeSdesPacketMultiSdesItem)
     sdesItemSec->ucType = 1;
     sdesItemSec->ucLength = 18;
 
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "google@example.com", sdesItemSec->ucLength);
 
@@ -191,7 +191,7 @@ TEST_F(RtcpSdesPacketTest, decodeSdesPacketDiffSdesType)
     sdesItem->ucLength = 18;
 
     RtpDt_UChar* pcBuffer = new RtpDt_UChar[sdesItem->ucLength];
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "sleepy@example.com", sdesItem->ucLength);
 
@@ -208,7 +208,7 @@ TEST_F(RtcpSdesPacketTest, decodeSdesPacketDiffSdesType)
     sdesItemSec->ucType = 2;
     sdesItemSec->ucLength = 18;
 
-    EXPECT_NE(pcBuffer, nullptr);
+    ASSERT_TRUE(pcBuffer != nullptr);
 
     memcpy(pcBuffer, "google@example.com", sdesItemSec->ucLength);
 
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSrPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSrPacketTest.cpp
index d031a502..2434c57f 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSrPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpSrPacketTest.cpp
@@ -35,7 +35,7 @@ TEST_F(RtcpSrPacketTest, TestGetSetMethods)
     objRtcpHeader.decodeRtcpHeader(pRtcpBuff, sizeof(pRtcpBuff));
     objRtcpSrPacket.setRtcpHdrInfo(objRtcpHeader);
     RtcpHeader* pRet = objRtcpSrPacket.getRtcpHdrInfo();
-    ASSERT_TRUE(pRet != NULL);
+    ASSERT_TRUE(pRet != nullptr);
     EXPECT_EQ(*pRet, objRtcpHeader);
 
     objRtcpSrPacket.setRtpTimestamp(0xAAAAAAAA);
@@ -68,7 +68,7 @@ TEST_F(RtcpSrPacketTest, TestDecodeSrPacketWithZeroReports)
     EXPECT_EQ(res, RTP_SUCCESS);
 
     tRTP_NTP_TIME* ntpTime = objRtcpSrPacket.getNtpTime();
-    ASSERT_TRUE(ntpTime != NULL);
+    ASSERT_TRUE(ntpTime != nullptr);
 
     EXPECT_EQ(ntpTime->m_uiNtpHigh32Bits, 0xe65fa531);
     EXPECT_EQ(ntpTime->m_uiNtpLow32Bits, 0x539124c2);
@@ -113,7 +113,7 @@ TEST_F(RtcpSrPacketTest, TestDecodeSrPacketWithOneReport)
     EXPECT_EQ(res, RTP_SUCCESS);
 
     tRTP_NTP_TIME* ntpTime = objRtcpSrPacket.getNtpTime();
-    ASSERT_TRUE(ntpTime != NULL);
+    ASSERT_TRUE(ntpTime != nullptr);
 
     EXPECT_EQ(ntpTime->m_uiNtpHigh32Bits, 3314714324);
     EXPECT_EQ(ntpTime->m_uiNtpLow32Bits, 3874060501);
@@ -122,13 +122,13 @@ TEST_F(RtcpSrPacketTest, TestDecodeSrPacketWithOneReport)
     EXPECT_EQ(objRtcpSrPacket.getSendOctetCount(), 320);
 
     RtcpRrPacket* pRRInfo = objRtcpSrPacket.getRrPktInfo();
-    ASSERT_TRUE(pRRInfo != NULL);
+    ASSERT_TRUE(pRRInfo != nullptr);
 
     std::list<RtcpReportBlock*> reports = pRRInfo->getReportBlockList();
     ASSERT_TRUE(reports.size() != 0);
 
     RtcpReportBlock* report = reports.front();
-    ASSERT_TRUE(report != NULL);
+    ASSERT_TRUE(report != nullptr);
 
     EXPECT_EQ(report->getSsrc(), 0xd2bd4e3e);
     EXPECT_EQ((int)report->getFracLost(), 0x10);
@@ -149,4 +149,4 @@ TEST_F(RtcpSrPacketTest, TestDecodeSrPacketWithShorterInputBuffer)
     EXPECT_EQ(res, RTP_FAILURE);
 }
 
-//TODO: Write test cases for formSRPacket
\ No newline at end of file
+// TODO: Write test cases for formSRPacket
\ No newline at end of file
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpXrPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpXrPacketTest.cpp
index 7b097b86..46ada70e 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpXrPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtcpXrPacketTest.cpp
@@ -28,7 +28,7 @@ TEST(RtcpXrPacketTest, TestGetSetMethods)
     objRtcpHeader.decodeRtcpHeader(pRtcpBuff, sizeof(pRtcpBuff));
     objRtcpXrPacket.setRtcpHdrInfo(objRtcpHeader);
     RtcpHeader* pRet = objRtcpXrPacket.getRtcpHdrInfo();
-    ASSERT_TRUE(pRet != NULL);
+    ASSERT_TRUE(pRet != nullptr);
     EXPECT_EQ(*pRet, objRtcpHeader);
 
     objRtcpXrPacket.setRTTD(0xAAAAAAAA);
@@ -42,7 +42,7 @@ TEST(RtcpXrPacketTest, TestGetSetMethods)
     RtpBuffer* pTestReportBuf = new RtpBuffer(sizeof(testReport), testReport);
     objRtcpXrPacket.setReportBlk(pTestReportBuf);
     RtpBuffer* pRetReportBuf = objRtcpXrPacket.getReportBlk();
-    ASSERT_TRUE(pRetReportBuf != NULL);
+    ASSERT_TRUE(pRetReportBuf != nullptr);
     EXPECT_EQ(
             memcmp(pTestReportBuf->getBuffer(), pRetReportBuf->getBuffer(), sizeof(testReport)), 0);
     EXPECT_EQ(pRetReportBuf->getLength(), sizeof(testReport));
@@ -61,7 +61,7 @@ TEST(RtcpXrPacketTest, TestDecodeXrPacket)
 
 TEST(RtcpXrPacketTest, TestFormXrPacket)
 {
-    RtpBuffer objRtcpPktBuf(64, NULL);
+    RtpBuffer objRtcpPktBuf(64, nullptr);
     objRtcpPktBuf.setLength(0);
     RtcpXrPacket objRtcpXrPacket;
     objRtcpXrPacket.setRttdOffset(2 * NTP2MSEC);
@@ -82,7 +82,7 @@ TEST(RtcpXrPacketTest, TestFormXrPacket)
     EXPECT_EQ(res, RTP_SUCCESS);
 
     RtpDt_UChar* buf = objRtcpPktBuf.getBuffer();
-    ASSERT_TRUE(buf != NULL);
+    ASSERT_TRUE(buf != nullptr);
     RtpDt_UChar expectedBuf[] = {
             0X81, 0XCF, 0X00, 0X02, 0X01, 0X02, 0X03, 0X04, 0XE6, 0X5F, 0XA5, 0X31};
 
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpOsUtilTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpOsUtilTest.cpp
index b473dd0a..846df317 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpOsUtilTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpOsUtilTest.cpp
@@ -23,7 +23,7 @@ TEST(RtpOsUtilTest, TestGetNtpTime)
     struct timeval stAndrodTp;
     RtpOsUtil::GetNtpTime(stCurNtpTimestamp);
 
-    if (gettimeofday(&stAndrodTp, RTP_NULL) != -1)
+    if (gettimeofday(&stAndrodTp, nullptr) != -1)
     {
         EXPECT_EQ(stCurNtpTimestamp.m_uiNtpHigh32Bits, stAndrodTp.tv_sec + 2208988800UL);
     }
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp
index e7571405..17c758cb 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpPacketTest.cpp
@@ -22,9 +22,9 @@ TEST(RtpPacketTest, TestConstructor)
     RtpPacket rtpPacket;
 
     // Check default value
-    EXPECT_TRUE(rtpPacket.getExtHeader() == NULL);
+    EXPECT_TRUE(rtpPacket.getExtHeader() == nullptr);
 
-    EXPECT_TRUE(rtpPacket.getRtpPayload() == NULL);
+    EXPECT_TRUE(rtpPacket.getRtpPayload() == nullptr);
 }
 
 TEST(RtpPacketTest, TestGetSets)
@@ -37,7 +37,7 @@ TEST(RtpPacketTest, TestGetSets)
     RtpBuffer* rtpPayloadBuffer = new RtpBuffer(sizeof(pRtpPayLoad), pRtpPayLoad);
     rtpPacket.setRtpPayload(rtpPayloadBuffer);
     RtpBuffer* pobjRtpBuffer = rtpPacket.getRtpPayload();
-    ASSERT_TRUE(pobjRtpBuffer != NULL);
+    ASSERT_TRUE(pobjRtpBuffer != nullptr);
 
     EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), sizeof(pRtpPayLoad)), 0);
     EXPECT_EQ(pobjRtpBuffer->getLength(), sizeof(pRtpPayLoad));
@@ -48,7 +48,7 @@ TEST(RtpPacketTest, TestGetSets)
     rtpPacket.setExtHeader(rtpExtBuffer);
     RtpBuffer* pobjRtpExtHdr = rtpPacket.getExtHeader();
 
-    ASSERT_TRUE(pobjRtpBuffer != NULL);
+    ASSERT_TRUE(pobjRtpBuffer != nullptr);
     EXPECT_EQ(memcmp(pRtpExtHdr, pobjRtpExtHdr->getBuffer(), sizeof(pRtpExtHdr)), 0);
     EXPECT_EQ(pobjRtpExtHdr->getLength(), sizeof(pRtpExtHdr));
 }
@@ -88,7 +88,7 @@ TEST(RtpPacketTest, TestDecodePacket)
 
     // check Header extension
     RtpBuffer* pobjRtpExtHdr = rtpPacket.getExtHeader();
-    ASSERT_TRUE(pobjRtpExtHdr != NULL);
+    ASSERT_TRUE(pobjRtpExtHdr != nullptr);
 
     uint8_t pRtpExtHdr[] = {0x41, 0x78, 0x42, 0x00};
 
@@ -100,7 +100,7 @@ TEST(RtpPacketTest, TestDecodePacket)
     uint8_t pRtpPayLoad[] = {0x67, 0x42, 0xc0, 0x0c, 0xda, 0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10,
             0x3c, 0x58, 0xba, 0x80};
 
-    ASSERT_TRUE(pobjRtpBuffer != NULL);
+    ASSERT_TRUE(pobjRtpBuffer != nullptr);
     EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), sizeof(pRtpPayLoad)), 0);
     EXPECT_EQ(pobjRtpBuffer->getLength(), sizeof(pRtpPayLoad));
 }
@@ -215,7 +215,7 @@ TEST(RtpPacketTest, TestDecodePacketWithPadding)
     uint8_t pRtpPayLoad[] = {0x67, 0x42, 0xc0, 0x0c, 0xda, 0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10,
             0x3c, 0x58, 0xba, 0x80};
 
-    ASSERT_TRUE(pobjRtpBuffer != NULL);
+    ASSERT_TRUE(pobjRtpBuffer != nullptr);
     EXPECT_EQ(memcmp(pRtpPayLoad, pobjRtpBuffer->getBuffer(), sizeof(pRtpPayLoad)), 0);
     EXPECT_EQ(pobjRtpBuffer->getLength(), sizeof(pRtpPayLoad));
 }
@@ -224,7 +224,7 @@ TEST(RtpPacketTest, TestFormPacketwithoutExtension)
 {
     RtpPacket rtpPacket;
     RtpHeader* pobjRtpHdr = rtpPacket.getRtpHeader();
-    ASSERT_TRUE(pobjRtpHdr != NULL);
+    ASSERT_TRUE(pobjRtpHdr != nullptr);
 
     // set Rtp Headers
     pobjRtpHdr->setVersion(RTP_TWO);
@@ -266,7 +266,7 @@ TEST(RtpPacketTest, TestFormPacketwithExtension)
 {
     RtpPacket rtpPacket;
     RtpHeader* pobjRtpHdr = rtpPacket.getRtpHeader();
-    ASSERT_TRUE(pobjRtpHdr != NULL);
+    ASSERT_TRUE(pobjRtpHdr != nullptr);
 
     /*
      * Real-Time Transport Protocol
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackTest.cpp
index 22de1653..c2484244 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackTest.cpp
@@ -35,7 +35,7 @@ TEST_F(RtpStackTest, TestConstructor)
     RtpStack rtpStack2;
 
     // Check default value
-    EXPECT_TRUE(rtpStack2.getStackProfile() == NULL);
+    EXPECT_TRUE(rtpStack2.getStackProfile() == nullptr);
 
     RtpStackProfile* pobjStackProfile3 = new RtpStackProfile();
     RtpStack rtpStack3(pobjStackProfile3);
@@ -77,7 +77,7 @@ TEST_F(RtpStackTest, TestDeleteRtpSessionFailures)
     EXPECT_EQ(rtpStack.deleteRtpSession(pobjRtpSession2), RTP_FAILURE);
 
     // check for Invalid param
-    EXPECT_EQ(rtpStack.deleteRtpSession(RTP_NULL), RTP_INVALID_PARAMS);
+    EXPECT_EQ(rtpStack.deleteRtpSession(nullptr), RTP_INVALID_PARAMS);
 
     // delete Rtp Sessions
     EXPECT_EQ(rtpStack.deleteRtpSession(pobjRtpSession1), RTP_SUCCESS);
diff --git a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackUtilTest.cpp b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackUtilTest.cpp
index 3924cda8..275cdfdc 100644
--- a/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackUtilTest.cpp
+++ b/tests/native/service/src/com/android/telephony/imsmedia/lib/libimsmedia/protocol/rtp/core/RtpStackUtilTest.cpp
@@ -24,7 +24,7 @@ TEST(RtpStackUtilTest, TestgetSequenceNumber)
             0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10, 0x3c, 0x58, 0xba, 0x80};
 
     EXPECT_EQ(RtpStackUtil::getSequenceNumber(pobjRtpPktBuf), 0xa583);
-    EXPECT_EQ(RtpStackUtil::getSequenceNumber(RTP_NULL), 0);
+    EXPECT_EQ(RtpStackUtil::getSequenceNumber(nullptr), 0);
 }
 
 TEST(RtpStackUtilTest, TestgetRtpSsrc)
@@ -34,7 +34,7 @@ TEST(RtpStackUtilTest, TestgetRtpSsrc)
             0x0f, 0x0a, 0x69, 0xa8, 0x10, 0x10, 0x10, 0x3c, 0x58, 0xba, 0x80};
 
     EXPECT_EQ(RtpStackUtil::getRtpSsrc(pobjRtpPktBuf), 0x927dcd02);
-    EXPECT_EQ(RtpStackUtil::getRtpSsrc(RTP_NULL), 0);
+    EXPECT_EQ(RtpStackUtil::getRtpSsrc(nullptr), 0);
 }
 
 TEST(RtpStackUtilTest, TestgetRtcpSsrc)
@@ -42,7 +42,7 @@ TEST(RtpStackUtilTest, TestgetRtcpSsrc)
     uint8_t pobjRtcpPktBuf[] = {0xFF, 0xFF, 0xFF, 0xFF, 0x59, 0x09, 0x41, 0x02};
 
     EXPECT_EQ(RtpStackUtil::getRtcpSsrc(pobjRtcpPktBuf), 0x59094102);
-    EXPECT_EQ(RtpStackUtil::getRtcpSsrc(RTP_NULL), 0);
+    EXPECT_EQ(RtpStackUtil::getRtcpSsrc(nullptr), 0);
 }
 
 TEST(RtpStackUtilTest, TestgenerateNewSsrc)
@@ -67,7 +67,7 @@ TEST(RtpStackUtilTest, TestgetMidFourOctets)
     stNtpTimestamp.m_uiNtpLow32Bits = 3417268256;
 
     EXPECT_EQ(RtpStackUtil::getMidFourOctets(&stNtpTimestamp), 0xa195cbaf);
-    EXPECT_EQ(RtpStackUtil::getMidFourOctets(RTP_NULL), 0);
+    EXPECT_EQ(RtpStackUtil::getMidFourOctets(nullptr), 0);
 }
 
 TEST(RtpStackUtilTest, TestcalcRtpTs)
@@ -102,13 +102,12 @@ TEST(RtpStackUtilTest, TestcalcRtpTsWithNoPrevTs)
             uiPrevRtpTimestamp, &stCurNtpTimestamp, &stPrevNtpTimestamp, 8000);
     EXPECT_EQ(rtpTs, uiPrevRtpTimestamp);
 
-    rtpTs = RtpStackUtil::calcRtpTimestamp(
-            uiPrevRtpTimestamp, RTP_NULL, &stPrevNtpTimestamp, 16000);
+    rtpTs = RtpStackUtil::calcRtpTimestamp(uiPrevRtpTimestamp, nullptr, &stPrevNtpTimestamp, 16000);
     EXPECT_EQ(rtpTs, 0);
 
-    rtpTs = RtpStackUtil::calcRtpTimestamp(uiPrevRtpTimestamp, &stCurNtpTimestamp, RTP_NULL, 8000);
+    rtpTs = RtpStackUtil::calcRtpTimestamp(uiPrevRtpTimestamp, &stCurNtpTimestamp, nullptr, 8000);
     EXPECT_EQ(rtpTs, 0);
 
-    rtpTs = RtpStackUtil::calcRtpTimestamp(uiPrevRtpTimestamp, RTP_NULL, RTP_NULL, 16000);
+    rtpTs = RtpStackUtil::calcRtpTimestamp(uiPrevRtpTimestamp, nullptr, nullptr, 16000);
     EXPECT_EQ(rtpTs, 0);
 }
\ No newline at end of file