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

Commit e2cf2f44 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I14669bc47ad72f5594677396fa2704b525def10a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77ec5b8c 366cdaf8

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

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

                return null;

                mMmsProxyAddress = mMmsProxyAddressUri.getHost();

            }

            }

            return new ApnSetting(this);

            return new ApnSetting(this);

        }

        }