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

Merge "Extract hostname if mMmsProxyAddress starts with http." into tm-qpr-dev am: 366cdaf821

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

Change-Id: I14669bc47ad72f5594677396fa2704b525def10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aishwarya Mallampati
2022-06-14 16:07:21 +00:00
committed by Automerger Merge Worker
parent 77ec5b8c3d 366cdaf821
commit e2cf2f44e6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -2190,11 +2190,10 @@ public class ApnSetting implements Parcelable {
} }
if ((mApnTypeBitmask & TYPE_MMS) != 0 && !TextUtils.isEmpty(mMmsProxyAddress) if ((mApnTypeBitmask & TYPE_MMS) != 0 && !TextUtils.isEmpty(mMmsProxyAddress)
&& mMmsProxyAddress.startsWith("http")) { && mMmsProxyAddress.startsWith("http")) {
if (Build.IS_DEBUGGABLE) { Log.wtf(LOG_TAG,"mms proxy(" + mMmsProxyAddress
throw new IllegalArgumentException("mms proxy(" + mMmsProxyAddress + ") should be a hostname, not a url");
+ ") should be a hostname, not a url"); Uri mMmsProxyAddressUri = Uri.parse(mMmsProxyAddress);
} mMmsProxyAddress = mMmsProxyAddressUri.getHost();
return null;
} }
return new ApnSetting(this); return new ApnSetting(this);
} }