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

Commit 35995c06 authored by Shivakumar Neginal's avatar Shivakumar Neginal
Browse files

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
parent 0f90c6e5

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

+2 −0
Original line number Diff line number Diff line
@@ -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) {