commit 154779b6afc84f567f26961871dc7380f0dba94c
author Amit Mahajan <amitmahajan@google.com> Mon Sep 11 17:51:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 11 17:51:18 2017 +0000
tree 7587b8f4d5137a85e3f57e6d7f7df6ef7d18f507
parent 21e55623f2224c13b54ac394f2aead9bf820869d
parent 6ca28e8362b6f53c5a6fe053dac5ff2f02dae51d

Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09
am: 6ca28e8362

Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c

src/com/android/settings/ApnEditor.java

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