commit 7eb859ff81c03ffb453b59d709a3365a1ae1c1c8
author arunvoddu <arunvoddu@google.com> Mon Mar 20 16:48:39 2023 +0000
committer arunvoddu <arunvoddu@google.com> Mon Mar 20 16:50:03 2023 +0000
tree c80cbd80fd43a037a1ea2987eaa2db9f10268e0f
parent 55b6e4f4a20a9d817a9a4c91456061bda9249dd3

Null safety check to avoid NPE in rare thread sync issue.

Bug: 272637077
Test: atest verified
Change-Id: Ib765ed0d6c5dc04e479c2bcc96e9f83a9e8fa96d

src/java/com/android/internal/telephony/cat/CatService.java

diff --git a/src/java/com/android/internal/telephony/cat/CatService.java b/src/java/com/android/internal/telephony/cat/CatService.java
index f2c692d..c56bbef 100644
--- a/src/java/com/android/internal/telephony/cat/CatService.java
+++ b/src/java/com/android/internal/telephony/cat/CatService.java
@@ -1010,7 +1010,11 @@
                     }
                 }
             }
-            mMsgDecoder.sendStartDecodingMessageParams(new RilMessage(msg.what, data));
+            if (mMsgDecoder != null) {
+                mMsgDecoder.sendStartDecodingMessageParams(new RilMessage(msg.what, data));
+            } else {
+                CatLog.e(this, "Error in handleMessage (" + msg.what + ") mMsgDecoder is NULL");
+            }
             break;
         case MSG_ID_CALL_SETUP:
             mMsgDecoder.sendStartDecodingMessageParams(new RilMessage(msg.what, null));