Merge "Clear the entries in updateState" into rvc-dev

This commit is contained in:
Calvin Pan
2020-03-23 10:11:58 +00:00
committed by Android (Google) Code Review

View File

@@ -204,6 +204,8 @@ public class EnabledNetworkModePreferenceController extends
} }
void setPreferenceEntries() { void setPreferenceEntries() {
clearAllEntries();
switch (getEnabledNetworkType()) { switch (getEnabledNetworkType()) {
case ENABLED_NETWORKS_CDMA_CHOICES: case ENABLED_NETWORKS_CDMA_CHOICES:
add5gEntry(addNrToLteNetworkType( add5gEntry(addNrToLteNetworkType(
@@ -608,6 +610,11 @@ public class EnabledNetworkModePreferenceController extends
return mEntries.toArray(new String[0]); return mEntries.toArray(new String[0]);
} }
private void clearAllEntries() {
mEntries.clear();
mEntriesValue.clear();
}
private String[] getEntryValues() { private String[] getEntryValues() {
Integer intArr[] = mEntriesValue.toArray(new Integer[0]); Integer intArr[] = mEntriesValue.toArray(new Integer[0]);
return Arrays.stream(intArr) return Arrays.stream(intArr)