commit b98d6644edc6ecc76241a4e3e00871aebdf4093c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 30 04:05:22 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 30 04:05:22 2023 +0000
tree 5b52a36c05d670842f99a8b12381975c514595f6
parent 94906cfe3d9fb8bfd40e38a660ae9a896ff661be
parent f2bf3503030f9164beedab88508ff8c4781d1c36

Merge "[Settings] Remove redundant sort" into udc-dev

src/com/android/settings/network/MobileNetworkRepository.java

diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index f609698..7d88821 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -433,7 +433,6 @@
         mActiveSubInfoEntityList = availableSubInfoEntityList.stream()
                 .filter(SubscriptionInfoEntity::isActiveSubscription)
                 .filter(SubscriptionInfoEntity::isSubscriptionVisible)
-                .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
                 .collect(Collectors.toList());
         if (DEBUG) {
             Log.d(TAG, "onActiveSubInfoChanged, activeSubInfoEntityList = "

src/com/android/settings/network/MobileNetworkSummaryController.java

diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java
index 1474836..f924636 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -134,7 +134,6 @@
             return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
         } else {
             return mSubInfoEntityList.stream()
-                    .sorted((e1, e2) -> Integer.compare(e1.simSlotIndex, e2.simSlotIndex))
                     .map(SubscriptionInfoEntity::getUniqueDisplayName)
                     .collect(Collectors.joining(", "));
         }