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

Commit 82f9cdc0 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362e am:... 

Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362e am: be8de58c am: 12866750 am: 06674f21

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

Change-Id: Ia0ff1eded98284ece684574a257e811958096753
parents 26b2fc57 06674f21

telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.net.Uri; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.PersistableBundle;

import android.text.TextUtils;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -561,7 +562,12 @@ public final class SipDelegateImsConfiguration implements Parcelable { 
        builder.setSipCniHeader(getString(KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING));

        builder.setSipAssociatedUriHeader(getString(KEY_SIP_CONFIG_P_ASSOCIATED_URI_HEADER_STRING));

        if (getBoolean(KEY_SIP_CONFIG_IS_GRUU_ENABLED_BOOL, false)) {

            builder.setPublicGruuUri(Uri.parse(getString(KEY_SIP_CONFIG_UE_PUBLIC_GRUU_STRING)));

            String uri = getString(KEY_SIP_CONFIG_UE_PUBLIC_GRUU_STRING);

            Uri gruuUri = null;

            if (!TextUtils.isEmpty(uri)) {

                gruuUri = Uri.parse(uri);

            }

            builder.setPublicGruuUri(gruuUri);

        }

        if (getBoolean(KEY_SIP_CONFIG_IS_IPSEC_ENABLED_BOOL, false)) {

            builder.setIpSecConfiguration(new SipDelegateConfiguration.IpSecConfiguration(