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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I6ca26dce7454098b492e6016936c6091e89106f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-11 15:07:08 +00:00
committed by Automerger Merge Worker

View File

@@ -24,7 +24,6 @@ import android.content.Intent;
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 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
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(", "));
}