Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev

This commit is contained in:
Amit Mahajan
2016-04-01 18:58:25 +00:00
committed by Android (Google) Code Review

View File

@@ -453,11 +453,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
return null;
} else {
String[] values = mRes.getStringArray(R.array.mvno_type_entries);
if (values[mvnoIndex].equals("None")) {
mMvnoMatchData.setEnabled(false);
} else {
mMvnoMatchData.setEnabled(true);
}
mMvnoMatchData.setEnabled(mvnoIndex != 0);
if (newValue != null && newValue.equals(oldValue) == false) {
if (values[mvnoIndex].equals("SPN")) {
mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());