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

Commit c2a37036 authored by donaldahn's avatar donaldahn Committed by Sungcheol Ahn
Browse files

[Telephony] checking if the delegate is null before calling. 

Bug: 218415289
Test: TMUS - send rcs message and clear Application

Change-Id: I72a2df60f706eace549be24795ea679899611513
parent 35896a3e

telephony/java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java

+12 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe 
        @Override

        public void sendMessage(SipMessage sipMessage, long configVersion) {

            SipDelegate d = mDelegate;

            if (d == null) {

                return;

            }

            final long token = Binder.clearCallingIdentity();

            try {

                mExecutor.execute(() -> d.sendMessage(sipMessage, configVersion));
@@ -59,6 +62,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe 
        @Override

        public void notifyMessageReceived(String viaTransactionId)  {

            SipDelegate d = mDelegate;

            if (d == null) {

                return;

            }

            final long token = Binder.clearCallingIdentity();

            try {

                mExecutor.execute(() -> d.notifyMessageReceived(viaTransactionId));
@@ -71,6 +77,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe 
        @Override

        public void notifyMessageReceiveError(String viaTransactionId, int reason) {

            SipDelegate d = mDelegate;

            if (d == null) {

                return;

            }

            final long token = Binder.clearCallingIdentity();

            try {

                mExecutor.execute(() -> d.notifyMessageReceiveError(viaTransactionId, reason));
@@ -83,6 +92,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe 
        @Override

        public void cleanupSession(String callId)  {

            SipDelegate d = mDelegate;

            if (d == null) {

                return;

            }

            final long token = Binder.clearCallingIdentity();

            try {

                mExecutor.execute(() -> d.cleanupSession(callId));