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

Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev

Browse Source 
am: cf11e21d47

Change-Id: Ica848195898e8d88e3882091c2a06ff4e79e55ca
This commit is contained in:
Amit Mahajan
2017-09-01 23:15:59 +00:00
committed by android-build-merger
parent c413dd167d cf11e21d47
commit f161b63c2a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -660,7 +660,11 @@ public class ApnEditor extends SettingsPreferenceFragment
return null; return null;
} else { } else {
String[] values = mRes.getStringArray(R.array.mvno_type_entries); String[] values = mRes.getStringArray(R.array.mvno_type_entries);
mMvnoMatchData.setEnabled(mvnoIndex != 0); boolean mvnoMatchDataUneditable =
mReadOnlyApn || (mReadOnlyApnFields != null
&& Arrays.asList(mReadOnlyApnFields)
.contains(Telephony.Carriers.MVNO_MATCH_DATA));
mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
if (newValue != null && newValue.equals(oldValue) == false) { if (newValue != null && newValue.equals(oldValue) == false) {
if (values[mvnoIndex].equals("SPN")) { if (values[mvnoIndex].equals("SPN")) {
mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName()); mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());