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

am: ea4ca2e

* commit 'ea4ca2e09622610d3ee0cfbfc5405949e7d00e4d':
  MVNO value is not grayed out when MVNO type is none

Change-Id: I7f492f1cf5aea400ac0a6df719975be531e1b48d
This commit is contained in:
Wei Huang
2016-04-01 19:17:51 +00:00
committed by android-build-merger

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());