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

Merge "Change to not cache user entered apn type as user may change it." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-03 01:46:21 +00:00
committed by Android (Google) Code Review
parent a3bdce963f 9eac2f7cbc
commit d1c3bb1341
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/ApnEditor.java
View File

@@ -118,7 +118,6 @@ public class ApnEditor extends SettingsPreferenceFragment
private String[] mReadOnlyApnTypes;
private String[] mReadOnlyApnFields;
private boolean mReadOnlyApn;
private String mUserEnteredApnType;
/**
* Standard projection for the interesting columns of a normal note.
@@ -216,7 +215,6 @@ public class ApnEditor extends SettingsPreferenceFragment
mReadOnlyApn = false;
mReadOnlyApnTypes = null;
mReadOnlyApnFields = null;
mUserEnteredApnType = null;
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
@@ -1120,15 +1118,11 @@ public class ApnEditor extends SettingsPreferenceFragment
}
private String getUserEnteredApnType() {
if (mUserEnteredApnType != null) {
return mUserEnteredApnType;
}
// if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
mUserEnteredApnType = mApnType.getText();
if (mUserEnteredApnType != null) mUserEnteredApnType = mUserEnteredApnType.trim();
if ((TextUtils.isEmpty(mUserEnteredApnType)
|| PhoneConstants.APN_TYPE_ALL.equals(mUserEnteredApnType))
String userEnteredApnType = mApnType.getText();
if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
if ((TextUtils.isEmpty(userEnteredApnType)
|| PhoneConstants.APN_TYPE_ALL.equals(userEnteredApnType))
&& !ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
StringBuilder editableApnTypes = new StringBuilder();
List<String> readOnlyApnTypes = Arrays.asList(mReadOnlyApnTypes);
@@ -1146,12 +1140,12 @@ public class ApnEditor extends SettingsPreferenceFragment
editableApnTypes.append(apnType);
}
}
mUserEnteredApnType = editableApnTypes.toString();
userEnteredApnType = editableApnTypes.toString();
Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
+ mUserEnteredApnType);
+ userEnteredApnType);
}
return mUserEnteredApnType;
return userEnteredApnType;
}
public static class ErrorDialog extends InstrumentedDialogFragment {