commit f876f3d0cc35fd400a7c7e02b2d50c6b065ed1a6
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 21 07:12:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 21 07:12:31 2020 +0000
tree 80d7e2160176f4e814b5cfb1b7d19b69767592ac
parent 173a7e73b3b57a8e88a14e6097fe25225af0ce10
parent 36c9ca1f2c94c1a37c6a56b76ae2867f2aeea722

Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I21df066581d1f2a43b693026a7a389da81922f05

src/com/android/settings/network/ApnEditor.java

diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index f9eccfa..a852fd6 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -726,6 +726,9 @@
                         telephonyManager = telephonyManagerForSubId;
                     }
                     mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+                } else {
+                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
+                    mMvnoMatchData.setText("");
                 }
             }
 
@@ -784,6 +787,7 @@
             }
             mMvnoType.setValue((String) newValue);
             mMvnoType.setSummary(mvno);
+            mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
         } else if (KEY_PASSWORD.equals(key)) {
             mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
         } else if (KEY_CARRIER_ENABLED.equals(key)) {