Merge "Fix mvno data field summary not update issue"

2020-07-21 06:44:08 +00:00
parent 1d45573eb2 012c5858c9
commit 4615179fc5
1 changed files with 4 additions and 0 deletions
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -754,6 +754,9 @@ public class ApnEditor extends SettingsPreferenceFragment
                        telephonyManager = telephonyManagerForSubId;
                    }
                    mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+                } else {
+                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
+                    mMvnoMatchData.setText("");
                }
            }

@@ -805,6 +808,7 @@ public class ApnEditor extends SettingsPreferenceFragment
            }
            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)) {