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

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

Merge "Fix broken MessagingStyle" into nyc-dev 

am: 8802fd07

* commit '8802fd07':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
parents db41be8e 8802fd07

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),