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

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;

                || 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);

        }

        }