PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove internal ApnSetting.

Browse Source 
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.

Bug: 77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
This commit is contained in:
yuemingw
2018-06-13 13:33:59 +01:00
parent 5ff91e4fbe
commit b98d538bbe
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/ApnSettings.java
View File

@@ -44,6 +44,7 @@ import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.data.ApnSetting;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@@ -56,7 +57,7 @@ import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents; 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.IccRecords;
import com.android.internal.telephony.uicc.UiccController; import com.android.internal.telephony.uicc.UiccController;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -330,7 +331,8 @@ public class ApnSettings extends RestrictedSettingsFragment implements
ArrayList<ApnPreference> mvnoList, IccRecords r, String mvnoType, ArrayList<ApnPreference> mvnoList, IccRecords r, String mvnoType,
String mvnoMatchData) { String mvnoMatchData) {
if (r != null && !TextUtils.isEmpty(mvnoType) && !TextUtils.isEmpty(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); mvnoList.add(pref);
// Since adding to mvno list, save mvno info // Since adding to mvno list, save mvno info
mMvnoType = mvnoType; mMvnoType = mvnoType;