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: d91b14d862

* commit 'd91b14d862568233d3467bb91497a3aabeecab29':
  Fix broken MessagingStyle

Change-Id: If3cd26444ee728e5b71eb3921aaa983591d0d8a1
This commit is contained in:
Adrian Roos
2016-05-17 21:23:10 +00:00
committed by android-build-merger
parent 14fd0ca669 d91b14d862
commit 5db7ac8086
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) {
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),