Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5e1b81be5320cffb3fe1a709abbe0346f6021733
This commit is contained in:
Brad Ebinger
2021-04-29 16:42:55 +00:00
committed by Automerger Merge Worker
parent 6b26dfae04 a2fc362eb9
commit be8de58cf0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/ims/SipDelegateImsConfiguration.java
View File

@@ -26,6 +26,7 @@ import android.net.Uri;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.text.TextUtils;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; 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.setSipCniHeader(getString(KEY_SIP_CONFIG_CELLULAR_NETWORK_INFO_HEADER_STRING));
builder.setSipAssociatedUriHeader(getString(KEY_SIP_CONFIG_P_ASSOCIATED_URI_HEADER_STRING)); builder.setSipAssociatedUriHeader(getString(KEY_SIP_CONFIG_P_ASSOCIATED_URI_HEADER_STRING));
if (getBoolean(KEY_SIP_CONFIG_IS_GRUU_ENABLED_BOOL, false)) { 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)) { if (getBoolean(KEY_SIP_CONFIG_IS_IPSEC_ENABLED_BOOL, false)) {
builder.setIpSecConfiguration(new SipDelegateConfiguration.IpSecConfiguration( builder.setIpSecConfiguration(new SipDelegateConfiguration.IpSecConfiguration(