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

Commit 40796778 authored by Pengquan Meng's avatar Pengquan Meng Committed by Gerrit Code Review
Browse files

Merge "Remove internal ApnSetting."

parents 5ff91e4f b98d538b

src/com/android/settings/ApnSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -44,6 +44,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;
@@ -56,7 +57,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.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -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;