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

Merge "Make sure mms proxy is hostname" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-08 03:04:25 +00:00
committed by Android (Google) Code Review
parent 256a0b563f 49dfa28259
commit 1a3b4ca6f8
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.hardware.radio.V1_5.ApnTypes; import android.hardware.radio.V1_5.ApnTypes;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.provider.Telephony; import android.provider.Telephony;
@@ -2183,6 +2184,14 @@ public class ApnSetting implements Parcelable {
|| TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) { || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) {
return null; return null;
} }
if ((mApnTypeBitmask & TYPE_MMS) != 0 && !TextUtils.isEmpty(mMmsProxyAddress)
&& mMmsProxyAddress.startsWith("http")) {
if (Build.IS_DEBUGGABLE) {
throw new IllegalArgumentException("mms proxy(" + mMmsProxyAddress
+ ") should be a hostname, not a url");
}
return null;
}
return new ApnSetting(this); return new ApnSetting(this);
} }