Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 029ec754 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Clear the entries in updateState" into rvc-dev am: 861d3446 

Change-Id: I0574aaf33278a82500809e7803b61e5e12b49eb9
parents 9eae2b75 861d3446

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+7 −0
Original line number Diff line number Diff line
@@ -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)