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

Do not throw NPE if GRUU uri is not populated

Browse Source 
Instead of GRUU URI parsing cause NPE if the string is empty,
check to make sure the string is populated before trying to parse.

Test: atest CtsTelephonyTestCases
Change-Id: I194ed8cc0e7df359ff9cf826e233f29e80ad71ff
This commit is contained in:
Brad Ebinger
2021-04-28 22:46:27 +00:00
parent c2c84d169a
commit 37a3528f56
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.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(