commit c2c0edff09ca484c74fe307d6ab6851fd9e6560a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 11 17:21:07 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 11 17:21:07 2017 +0000
tree ad7f2cdee8cf022276353dbc8888172290cbe73c
parent c9e532f508c1faa25a59e0ea1fe129e920cea6a4
parent ad8eba3097106bcfaf5d1ba74e4729034d03b0ed

Merge "Change to disable mvno data field in ApnEditor if needed."

src/com/android/settings/ApnEditor.java

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index f67f503..7393091 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -657,7 +657,11 @@
             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());