commit 59ec10b05aa76ad99c72de8cb00a8fa53f0518ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 11 14:52:04 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 14:52:04 2023 +0000
tree 203bee87bb6f7781e9c971ae05a98431c99216a1
parent 643b51c42ed0ab6966be49530e373a70f5bdb0e0
parent 50dc4e857b08b895563d68c67c55e0128237307b

Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev

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 99a2731..1474836 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -24,7 +24,6 @@
 import android.os.UserManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.euicc.EuiccManager;
-import android.util.Log;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -135,6 +134,7 @@
             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(", "));
         }