commit 9bcae821b3b8303e382cba0019ea14481efeef32
author Grant Menke <grantmenke@google.com> Fri Dec 06 18:07:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 06 18:07:49 2024 +0000
tree 0d3eb897d2f92be782294a6563792c4d1849cd8a
parent 17c7985583c59fed3af852bb52e89bbdfe63854d
parent 55b7e92e63003d4e7c4d6484e56a1b3bb1760df4

Merge "Avoid NPE in RadioConfigProxy." into main

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() {