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

Merge "Throw NPE instead of IllegalArgumentException in SipDelegateManager" am: 5733e616fb am: aff57e7818 am: 9a880b4f39

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

Change-Id: Ib1daec20b74e0225645a53588e72b4f57c78d1cf
This commit is contained in:
Brad Ebinger
2021-04-21 17:55:02 +00:00
committed by Automerger Merge Worker
parent 6e1db3d577 9a880b4f39
commit 7e8765d37a
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
telephony/java/android/telephony/ims/SipDelegateManager.java
View File

@@ -39,6 +39,7 @@ import com.android.internal.annotations.VisibleForTesting;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Objects;
import java.util.concurrent.Executor;
/**
@@ -322,9 +323,10 @@ public class SipDelegateManager {
public void createSipDelegate(@NonNull DelegateRequest request, @NonNull Executor executor,
@NonNull DelegateConnectionStateCallback dc,
@NonNull DelegateConnectionMessageCallback mc) throws ImsException {
if (request == null || executor == null || dc == null || mc == null) {
throw new IllegalArgumentException("Invalid arguments passed into createSipDelegate");
}
Objects.requireNonNull(request, "The DelegateRequest must not be null.");
Objects.requireNonNull(executor, "The Executor must not be null.");
Objects.requireNonNull(dc, "The DelegateConnectionStateCallback must not be null.");
Objects.requireNonNull(mc, "The DelegateConnectionMessageCallback must not be null.");
try {
SipDelegateConnectionAidlWrapper wrapper =
new SipDelegateConnectionAidlWrapper(executor, dc, mc);
@@ -355,10 +357,7 @@ public class SipDelegateManager {
@RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)
public void destroySipDelegate(@NonNull SipDelegateConnection delegateConnection,
@SipDelegateDestroyReason int reason) {
if (delegateConnection == null) {
throw new IllegalArgumentException("invalid argument passed into destroySipDelegate");
}
Objects.requireNonNull(delegateConnection, "SipDelegateConnection can not be null.");
if (delegateConnection instanceof SipDelegateConnectionAidlWrapper) {
SipDelegateConnectionAidlWrapper w =
(SipDelegateConnectionAidlWrapper) delegateConnection;
@@ -396,9 +395,7 @@ public class SipDelegateManager {
@RequiresPermission(Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION)
public void triggerFullNetworkRegistration(@NonNull SipDelegateConnection connection,
@IntRange(from = 100, to = 699) int sipCode, @Nullable String sipReason) {
if (connection == null) {
throw new IllegalArgumentException("invalid connection.");
}
Objects.requireNonNull(connection, "SipDelegateConnection can not be null.");
if (connection instanceof SipDelegateConnectionAidlWrapper) {
SipDelegateConnectionAidlWrapper w = (SipDelegateConnectionAidlWrapper) connection;
try {