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

Commit 0a75792d 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: 87ce5eed 

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



Change-Id: Iee39ff0f07a08c02f14290601d6e6fc8ba640fb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab9517f8 87ce5eed

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