Change to disable mvno data field in ApnEditor if needed.

Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
This commit is contained in:
Amit Mahajan
2017-08-31 13:59:20 -07:00
parent c9e532f508
commit ad8eba3097

View File

@@ -657,7 +657,11 @@ public class ApnEditor extends SettingsPreferenceFragment
return null;
} else {
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 (values[mvnoIndex].equals("SPN")) {
mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());