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

Commit e5b0923a authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd07 am: efc9c88d 

am: 31459c32

* commit '31459c32':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
parents 0353c378 31459c32

core/java/android/app/Notification.java

+1 −2
Original line number Diff line number Diff line
@@ -4726,8 +4726,7 @@ public class Notification implements Parcelable 


            static Message getMessageFromBundle(Bundle bundle) {

                try {

                    if (!bundle.containsKey(KEY_TEXT) || !bundle.containsKey(KEY_TIMESTAMP) ||

                            !bundle.containsKey(KEY_SENDER)) {

                    if (!bundle.containsKey(KEY_TEXT) || !bundle.containsKey(KEY_TIMESTAMP)) {

                        return null;

                    } else {

                        Message message = new Message(bundle.getCharSequence(KEY_TEXT),