Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab am: 029ec754a3 am: 4acdc6f97e

Change-Id: I6b2accfb1919bf208c6e52c23425e5fe43c76c27
2020-03-23 10:53:36 +00:00
parent 5d6a3e4551 4acdc6f97e
commit 39123486e4
1 changed files with 7 additions and 0 deletions
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -204,6 +204,8 @@ public class EnabledNetworkModePreferenceController extends
        }

        void setPreferenceEntries() {
+            clearAllEntries();
+
            switch (getEnabledNetworkType()) {
                case ENABLED_NETWORKS_CDMA_CHOICES:
                    add5gEntry(addNrToLteNetworkType(
@@ -608,6 +610,11 @@ public class EnabledNetworkModePreferenceController extends
            return mEntries.toArray(new String[0]);
        }

+        private void clearAllEntries() {
+            mEntries.clear();
+            mEntriesValue.clear();
+        }
+
        private String[] getEntryValues() {
            Integer intArr[] = mEntriesValue.toArray(new Integer[0]);
            return Arrays.stream(intArr)