Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Telephony] checking if the delegate is null before calling." am: 04d04ca89d am: 548c9b5edf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015035

Change-Id: I1badb38f8d68ea003ad5d28e12a16e5d1c7bdae5
This commit is contained in:
Sungcheol Ahn
2022-03-09 01:51:26 +00:00
committed by Automerger Merge Worker
parent 8fe59a521e 548c9b5edf
commit 218437e97f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java
View File

@@ -47,6 +47,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe
@Override @Override
public void sendMessage(SipMessage sipMessage, long configVersion) { public void sendMessage(SipMessage sipMessage, long configVersion) {
SipDelegate d = mDelegate; SipDelegate d = mDelegate;
if (d == null) {
return;
}
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
mExecutor.execute(() -> d.sendMessage(sipMessage, configVersion)); mExecutor.execute(() -> d.sendMessage(sipMessage, configVersion));
@@ -58,6 +61,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe
@Override @Override
public void notifyMessageReceived(String viaTransactionId) { public void notifyMessageReceived(String viaTransactionId) {
SipDelegate d = mDelegate; SipDelegate d = mDelegate;
if (d == null) {
return;
}
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
mExecutor.execute(() -> d.notifyMessageReceived(viaTransactionId)); mExecutor.execute(() -> d.notifyMessageReceived(viaTransactionId));
@@ -70,6 +76,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe
@Override @Override
public void notifyMessageReceiveError(String viaTransactionId, int reason) { public void notifyMessageReceiveError(String viaTransactionId, int reason) {
SipDelegate d = mDelegate; SipDelegate d = mDelegate;
if (d == null) {
return;
}
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
mExecutor.execute(() -> d.notifyMessageReceiveError(viaTransactionId, reason)); mExecutor.execute(() -> d.notifyMessageReceiveError(viaTransactionId, reason));
@@ -82,6 +91,9 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe
@Override @Override
public void cleanupSession(String callId) { public void cleanupSession(String callId) {
SipDelegate d = mDelegate; SipDelegate d = mDelegate;
if (d == null) {
return;
}
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { try {
mExecutor.execute(() -> d.cleanupSession(callId)); mExecutor.execute(() -> d.cleanupSession(callId));