From 35995c06804131e97a9620500a9b1c9aa384228b Mon Sep 17 00:00:00 2001
From: Shivakumar Neginal <shivaneginal@google.com>
Date: Mon, 8 Nov 2021 10:24:11 +0000
Subject: [PATCH]  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
---
 .../java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/telephony/java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java b/telephony/java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java
index f0048248a5ccc..493ad5e473a53 100644
--- a/telephony/java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java
+++ b/telephony/java/android/telephony/ims/aidl/SipDelegateAidlWrapper.java
@@ -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) {