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

Commit 5953af45 authored by Rayan Osseiran's avatar Rayan Osseiran Committed by Automerger Merge Worker
Browse files

Merge "Add missing fields to ApnSetting#toContentValues" into udc-dev am: fc981bc8 

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



Change-Id: Ib9a071766237bf1eb419a6a72da55049c61ff6b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b0757d5 fc981bc8

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

+9 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,14 @@ public class ApnSetting implements Parcelable { 
    public ContentValues toContentValues() {

        ContentValues apnValue = new ContentValues();

        apnValue.put(Telephony.Carriers.NUMERIC, nullToEmpty(mOperatorNumeric));

        // If the APN is editable, the user may be able to set an invalid numeric. The numeric must

        // always be 5 or 6 characters (depending on the length of the MNC), so skip if it is

        // potentially invalid.

        if (!TextUtils.isEmpty(mOperatorNumeric)

                && (mOperatorNumeric.length() == 5 || mOperatorNumeric.length() == 6)) {

            apnValue.put(Telephony.Carriers.MCC, mOperatorNumeric.substring(0, 3));

            apnValue.put(Telephony.Carriers.MNC, mOperatorNumeric.substring(3));

        }

        apnValue.put(Telephony.Carriers.NAME, nullToEmpty(mEntryName));

        apnValue.put(Telephony.Carriers.APN, nullToEmpty(mApnName));

        apnValue.put(Telephony.Carriers.PROXY, nullToEmpty(mProxyAddress));
@@ -1356,6 +1364,7 @@ public class ApnSetting implements Parcelable { 
                getProtocolStringFromInt(mRoamingProtocol));

        apnValue.put(Telephony.Carriers.CARRIER_ENABLED, mCarrierEnabled);

        apnValue.put(Telephony.Carriers.MVNO_TYPE, getMvnoTypeStringFromInt(mMvnoType));

        apnValue.put(Telephony.Carriers.MVNO_MATCH_DATA, nullToEmpty(mMvnoMatchData));

        apnValue.put(Telephony.Carriers.NETWORK_TYPE_BITMASK, mNetworkTypeBitmask);

        apnValue.put(Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK,

                mLingeringNetworkTypeBitmask);