diff options
| author | Julia Reynolds <juliacr@google.com> | 2023-01-18 15:23:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-18 15:23:35 +0000 |
| commit | 42a3c415d7c0c65cda1aaab16698eb699048b482 (patch) | |
| tree | 7c1fe9556248ca3b0d26ed2d2e9930aa0497c306 | |
| parent | e97ad39eb79a16dbc0b7cfab4c0da21abdfd45e2 (diff) | |
| parent | 288f929c8a3adc1b0e264616ff8ec0825c5002cd (diff) | |
| download | base-42a3c415d7c0c65cda1aaab16698eb699048b482.tar.gz | |
Merge "Fix crash when comparing messages"
| -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; } |