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

Commit 1fc68591 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Remove internal ApnSetting." 

am: 40796778

Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
parents 44de687b 40796778

src/com/android/settings/network/ApnSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.telephony.CarrierConfigManager; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.text.TextUtils;

import android.util.Log;

import android.view.Menu;
@@ -54,7 +55,7 @@ import android.widget.Toast; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.dataconnection.ApnSetting;

import com.android.internal.telephony.dataconnection.ApnSettingUtils;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.UiccController;

import com.android.settings.R;
@@ -330,7 +331,8 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
                              ArrayList<ApnPreference> mvnoList, IccRecords r, String mvnoType,

                              String mvnoMatchData) {

        if (r != null && !TextUtils.isEmpty(mvnoType) && !TextUtils.isEmpty(mvnoMatchData)) {

            if (ApnSetting.mvnoMatches(r, mvnoType, mvnoMatchData)) {

            if (ApnSettingUtils.mvnoMatches(r, ApnSetting.getMvnoTypeIntFromString(mvnoType),

                    mvnoMatchData)) {

                mvnoList.add(pref);

                // Since adding to mvno list, save mvno info

                mMvnoType = mvnoType;