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 am: efc9c88d00

Browse Source 
am: 31459c3202

* commit '31459c32028951101a338abf95e48d9143444914':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
This commit is contained in:
Adrian Roos
2016-05-17 21:38:31 +00:00
committed by android-build-merger
parent 0353c378ba 31459c3202
commit e5b0923a02
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),