commit ff2da5780462bd1c9fb3bf400c7a6f22fb1ec8bc
author yuemingw <yuemingw@google.com> Tue Jun 12 15:55:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 12 15:55:42 2018 -0700
tree 21ed38d9ff77ab675aa6c72889a7e6ce7967c12c
parent 040faac1d0a9383f864e84d855c34679ece7d3ae
parent ff73564ea0fb26f3a2f688d10bede49d05b4417f

Remove internal ApnSetting.
am: ff73564ea0

Change-Id: I8faf14404a5e59f598cc531a776b53471cb17fce

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

diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index e41d1b8..f80acd4 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -43,6 +43,7 @@
 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 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;
@@ -336,7 +337,8 @@
                               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;