commit e652b7b0cade699a396f55602f5d7a282466c705
author Amit Mahajan <amitmahajan@google.com> Fri Apr 01 18:58:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 18:58:25 2016 +0000
tree dded953018232270d555700139e57943ac1dbb80
parent 00c334ccba341761af448805ddfc842394f3dfbb
parent 84fd69a7831e4875870a008b84158ee6688782f2

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

src/com/android/settings/ApnEditor.java

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 102d6cc..3163b63 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -453,11 +453,7 @@
             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());