Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
This commit is contained in:
Adrian Roos
2016-05-17 21:22:39 +00:00
committed by android-build-merger
parent 14fd0ca669 efc9c88d00
commit 31459c3202
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Notification.java
View File

@@ -4726,8 +4726,7 @@ public class Notification implements Parcelable
static Message getMessageFromBundle(Bundle bundle) { static Message getMessageFromBundle(Bundle bundle) {
try { try {
if (!bundle.containsKey(KEY_TEXT) || !bundle.containsKey(KEY_TIMESTAMP) || if (!bundle.containsKey(KEY_TEXT) || !bundle.containsKey(KEY_TIMESTAMP)) {
!bundle.containsKey(KEY_SENDER)) {
return null; return null;
} else { } else {
Message message = new Message(bundle.getCharSequence(KEY_TEXT), Message message = new Message(bundle.getCharSequence(KEY_TEXT),