Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6539e7b6 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Add null check to avoid NPE when text message has null datetime" am:... 

Merge "Add null check to avoid NPE when text message has null datetime" am: 87ce5eed am: 0a75792d am: 3963d90e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2481678



Change-Id: I52908d013d440af28e6648c11e7530b210b04695
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents feded3b8 3963d90e

android/app/src/com/android/bluetooth/mapclient/MceStateMachine.java

+5 −0
Original line number Diff line number Diff line
@@ -823,6 +823,11 @@ class MceStateMachine extends StateMachine { 
                                + " [Connected]: fetch message content, handle=" + msg.getHandle());

                    }

                    // A message listing coming from the server should always have up to date data

                    if (msg.getDateTime() == null) {

                        Log.w(TAG, "message with handle " + msg.getHandle()

                                + " has a null datetime, ignoring");

                        continue;

                    }

                    mMessages.put(msg.getHandle(), new MessageMetadata(msg.getHandle(),

                            msg.getDateTime().getTime(), msg.isRead(), MESSAGE_SEEN));

                    getMessage(msg.getHandle());