Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b7e92e authored by Grant Menke's avatar Grant Menke
Browse files

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
parent 35168cf0

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

+10 −2
Original line number Diff line number Diff line
@@ -281,7 +281,11 @@ public class RadioConfigProxy { 
        }



        public void linkToDeath(long cookie) throws RemoteException {

            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 class RadioConfigProxy { 
        }



        public void linkToDeath(int cookie) throws RemoteException {

            if (mService != null) {

                mService.linkToDeath(this, cookie);

            } else {

                Rlog.w(TAG, "linkToDeath: skipping since mService is null");

            }

        }



        public void clear() {