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

Commit 3963d90e 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

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



Change-Id: Icdf5699311b79b829e4cc1d68d230dca6ffc98bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e57639b0 0a75792d

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());