commit 55b7e92e63003d4e7c4d6484e56a1b3bb1760df4
author Grant Menke <grantmenke@google.com> Thu Dec 05 16:12:00 2024 -0800
committer Grant Menke <grantmenke@google.com> Fri Dec 06 00:23:31 2024 +0000
tree cc10499070ad18203a057694a1cfd8c5935486a6
parent 35168cf0f621b025643fca38634a0e1bfda548c4

Avoid NPE in RadioConfigProxy.

This CL adds a null check to the linkToDeath method in Radio Config Hidl/Aidl Service Death Recipent to avoid an NPE when mService is null.

Test: build
Flag: EXEMPT bugfix
Fixes: 378098779
Change-Id: Icf023d358dd2bf04a3d4dd03b3eba0ca6cb45ba4

src/java/com/android/internal/telephony/RadioConfigProxy.java

diff --git a/src/java/com/android/internal/telephony/RadioConfigProxy.java b/src/java/com/android/internal/telephony/RadioConfigProxy.java
index 9f34e29..153747b 100644
--- a/src/java/com/android/internal/telephony/RadioConfigProxy.java
+++ b/src/java/com/android/internal/telephony/RadioConfigProxy.java
@@ -281,7 +281,11 @@
         }
 
         public void linkToDeath(long cookie) throws RemoteException {
-            mService.linkToDeath(this, cookie);
+            if (mService != null) {
+                mService.linkToDeath(this, cookie);
+            } else {
+                Rlog.w(TAG, "linkToDeath: skipping since mService is null");
+            }
         }
 
         public void clear() {
@@ -316,7 +320,11 @@
         }
 
         public void linkToDeath(int cookie) throws RemoteException {
-            mService.linkToDeath(this, cookie);
+            if (mService != null) {
+                mService.linkToDeath(this, cookie);
+            } else {
+                Rlog.w(TAG, "linkToDeath: skipping since mService is null");
+            }
         }
 
         public void clear() {