Merge "Fix crash when comparing messages"

2023-01-18 15:23:35 +00:00
parent e97ad39eb7 288f929c8a
commit 42a3c415d7
1 changed files with 4 additions and 0 deletions
--- a/core/java/com/android/internal/widget/MessagingMessage.java
+++ b/core/java/com/android/internal/widget/MessagingMessage.java
@@ -68,6 +68,10 @@ public interface MessagingMessage extends MessagingLinearLayout.MessagingChild {

    default boolean sameAs(Notification.MessagingStyle.Message message) {
        Notification.MessagingStyle.Message ownMessage = getMessage();
+        // We have to make sure both messages are not null to go further comparison
+        if (message == null || ownMessage == null) {
+            return message == ownMessage;
+        }
        if (!Objects.equals(message.getText(), ownMessage.getText())) {
            return false;
        }