Snap for 5798008 from 00228481c9011dae62e4049c458c58af25c5ec95 to sdk-releaseplatform-tools-29.0.4platform-tools-29.0.3

Change-Id: I6dc9da3228c163f82d25b3b34989061f9e19dbc0

2 files changed, 20 insertions, 0 deletions

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;
     }
 
diff --git a/src/com/android/messaging/ui/conversation/SimIconView.java b/src/com/android/messaging/ui/conversation/SimIconView.java
index e2e446c..6799bad 100644
--- a/src/com/android/messaging/ui/conversation/SimIconView.java
+++ b/src/com/android/messaging/ui/conversation/SimIconView.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.graphics.Outline;
 import android.net.Uri;
 import android.util.AttributeSet;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewOutlineProvider;
 
@@ -44,6 +45,14 @@ public class SimIconView extends ContactIconView {
     }
 
     @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (isClickable()) {
+            return super.onTouchEvent(event);
+        }
+        return true;
+    }
+
+    @Override
     protected void maybeInitializeOnClickListener() {
         // TODO: SIM icon view shouldn't consume or handle clicks, but it should if
         // this is the send button for the only SIM in the device or if MSIM is not supported.