commit 36c9ca1f2c94c1a37c6a56b76ae2867f2aeea722
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 21 06:58:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 21 06:58:14 2020 +0000
tree 50217ec5877dd412f4e5aa18fdd5dac57f3c8a93
parent 83d7191a22e1b1d61f5784d5e1af14b224ea9fc4
parent 4615179fc58620cee113046a9340bf87b674381d

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

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

Change-Id: Idf9f8b66f9b65f4118b8b2abd32eca2a076aea79

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 ac23b21..111ee8b 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -754,6 +754,9 @@
                         telephonyManager = telephonyManagerForSubId;
                     }
                     mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+                } else {
+                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
+                    mMvnoMatchData.setText("");
                 }
             }
 
@@ -805,6 +808,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)) {