Merge changes from topic "presubmit-am-e2e0a85d5c2447e486904f5bd3376c69" into tm-mainline-prod

* changes:
  [automerge] Make sure mms proxy is hostname 2p: 49dfa28259
  Make sure mms proxy is hostname

telephony/java/android/telephony/data/ApnSetting.java

@@ -24,6 +24,7 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.hardware.radio.V1_5.ApnTypes;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.Telephony;
@@ -2183,6 +2184,14 @@ public class ApnSetting implements Parcelable {
                 || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) {
                 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);
         }