diff options
| -rw-r--r-- | core/java/com/android/internal/widget/MessagingMessage.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/MessagingMessage.java b/core/java/com/android/internal/widget/MessagingMessage.java index 2cc0d2305a78..5ecd3b82053d 100644 --- 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; } |