Fix NullPointerException during sip delegate creation.

SipDelegateAidlWrapper should be able to accept a null set of deniedTags
as per @Nullable tag. Detect the null condition and use empty set.

Bug: 204504765
Test: Manual
Change-Id: Ifadd47decabcad34cc4fcd542ad205f082babbd8
This commit is contained in:
Shivakumar Neginal
2021-11-08 10:24:11 +00:00
parent 0f90c6e5d6
commit 35995c0680

View File

@@ -31,6 +31,7 @@ import android.telephony.ims.SipMessage;
import android.telephony.ims.stub.SipDelegate;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -141,6 +142,7 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe
public void onCreated(@NonNull SipDelegate delegate,
@Nullable Set<FeatureTagState> deniedTags) {
mDelegate = delegate;
deniedTags = (deniedTags == null) ? Collections.emptySet() : deniedTags;
try {
mStateBinder.onCreated(mDelegateBinder, new ArrayList<>(deniedTags));
} catch (RemoteException e) {