commit 5f73fa9689f77e0e438dc18a0e9215d8f5b5d824
author Adrian Roos <roosa@google.com> Thu May 19 19:52:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 19 19:52:37 2016 +0000
tree d3aed5d638cf2e3ba8bed30d5264681314a7e8ca
parent 16b33dbbb5bd90465dbb8a59fda3f556a2b44d92
parent 77b9c767d2704465ad64405e96fee7ac204950ab

Merge "Fix broken MessagingStyle" into nyc-dev
am: 77b9c767d2

* commit '77b9c767d2704465ad64405e96fee7ac204950ab':
  Fix broken MessagingStyle

Change-Id: Ib8694070141a447f5df2bf22ee9d6f61adcb8812

v4/java/android/support/v4/app/NotificationCompat.java

diff --git a/v4/java/android/support/v4/app/NotificationCompat.java b/v4/java/android/support/v4/app/NotificationCompat.java
index 8b1bc10..c8b3a9b 100644
--- a/v4/java/android/support/v4/app/NotificationCompat.java
+++ b/v4/java/android/support/v4/app/NotificationCompat.java
@@ -2187,8 +2187,7 @@
 
             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),