commit 8618b8649fe7d5843d65d90d604b9d823b3d59c6
author Daniel Nishi <dhnishi@google.com> Fri Sep 01 22:49:21 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 01 22:49:21 2017 +0000
tree 2ffd42ae2d44a7a8b9c4b6e487a2b5d976d37364
parent cf11e21d47081bde2a4abfb089ea294576c95bfc
parent 83ceab82e4f6dd55e03a5832cf4b4ceca71b0722

Merge "Show work profile apps only on app list." into oc-mr1-dev

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