commit bdd1adf0b17fc006c021b7b0f0e24f990c48e9c0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Apr 25 17:39:56 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 17:39:56 2024 +0000
tree f73c1b13d771d1e5389dad4b6735352f24720003
parent 318f477d6665531b2ef0ec01166caffc83f0f3bd
parent 01658fc723807b123c1486897d794830c2a780d3

Merge "[AsyncHybridViewInflation] Fix crash in Historic Message handling" into main

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt
index d3c874c..3fce9ce 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt
@@ -217,8 +217,9 @@
         var currentGroup: MutableList<MessagingStyle.Message>? = null
         var currentSenderKey: CharSequence? = null
         val groups = mutableListOf<MutableList<MessagingStyle.Message>>()
-        for (i in 0 until (historicMessages.size + messages.size)) {
-            val message = if (i < historicMessages.size) historicMessages[i] else messages[i]
+        val histSize = historicMessages.size
+        for (i in 0 until (histSize + messages.size)) {
+            val message = if (i < histSize) historicMessages[i] else messages[i - histSize]
 
             val sender = message.senderPerson
             val senderKey = sender?.getKeyOrName()