From b22bc643cecc175e0b320d40a0c381f23c1bf0a6 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Thu, 1 Aug 2019 18:36:04 +0900 Subject: [PATCH] Sort ParticipantsData in order of the slot id getSelfParticipants() returns the ParticipantData list arranged in ascending order of the slot id to show SIM UIs from lowest to highest id consistently. Test: Verify SettingsFragment and SimSelector order in multi-sim device Change-Id: I0f5f27c6467cb21a6d11271d1a0a6beef36630a6 Signed-off-by: Taesu Lee --- .../datamodel/data/SelfParticipantsData.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java index fc4027f..f389a78 100644 --- a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java +++ b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java @@ -20,6 +20,8 @@ import android.database.Cursor; import androidx.collection.ArrayMap; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import com.android.messaging.util.OsUtil; @@ -61,6 +63,15 @@ public class SelfParticipantsData { list.add(self); } } + Collections.sort( + list, + new Comparator() { + public int compare(Object o1, Object o2) { + int slotId1 = ((ParticipantData) o1).getSlotId(); + int slotId2 = ((ParticipantData) o2).getSlotId(); + return slotId1 > slotId2 ? 1 : -1; + } + }); return list; }