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

Commit 758abcac authored by Shivakumar Neginal's avatar Shivakumar Neginal Committed by Android (Google) Code Review
Browse files

Merge " Fix NullPointerException during sip delegate creation."

parents 69ddc5cd 35995c06

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.telephony.ims.SipMessage; 
import android.telephony.ims.stub.SipDelegate;

import android.telephony.ims.stub.SipDelegate;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;
@@ -141,6 +142,7 @@ public class SipDelegateAidlWrapper implements DelegateStateCallback, DelegateMe 
    public void onCreated(@NonNull SipDelegate delegate,

    public void onCreated(@NonNull SipDelegate delegate,

            @Nullable Set<FeatureTagState> deniedTags) {

            @Nullable Set<FeatureTagState> deniedTags) {

        mDelegate = delegate;

        mDelegate = delegate;

        deniedTags = (deniedTags == null) ? Collections.emptySet() : deniedTags;

        try {

        try {

            mStateBinder.onCreated(mDelegateBinder, new ArrayList<>(deniedTags));

            mStateBinder.onCreated(mDelegateBinder, new ArrayList<>(deniedTags));

        } catch (RemoteException e) {

        } catch (RemoteException e) {