Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83874b07 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make sure mms proxy is hostname" into tm-dev am: 1a3b4ca6 am: d11fd1b1 

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



Change-Id: Ic2d930e18ad8277a6eb70228c97288405529f4c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46739624 d11fd1b1

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

+9 −0
Original line number Diff line number Diff line
@@ -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);

        }