Merge "[MEP] sort the simSlotMapping by logcal slot id" into tm-dev am: faa0eddcc7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17159743 Change-Id: Iff7f806c02ad6a4413f9a98eb7db93691debe0c3
2022-03-11 07:55:42 +00:00
parent 335edbf89d faa0eddcc7
commit e742684bba
2 changed files with 52 additions and 3 deletions
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -369,6 +369,7 @@ public class UiccSlotUtil {
                    }
                    return true;
                })
+                .sorted(Comparator.comparingInt(UiccSlotMapping::getLogicalSlotIndex))
                .mapToInt(uiccSlotMapping -> uiccSlotMapping.getLogicalSlotIndex())
                .findFirst()
                .orElse(INVALID_LOGICAL_SLOT_ID);