Merge "Fix wrong Notification refactor" into qt-qpr1-dev

This commit is contained in:
TreeHugger Robot
2019-09-25 22:35:36 +00:00
committed by Android (Google) Code Review

View File

@@ -10508,12 +10508,7 @@ public class Notification implements Parcelable
final StandardTemplateParams fillTextsFrom(Builder b) {
Bundle extras = b.mN.extras;
this.title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE));
CharSequence text = extras.getCharSequence(EXTRA_BIG_TEXT);
if (TextUtils.isEmpty(text)) {
text = extras.getCharSequence(EXTRA_TEXT);
}
this.text = b.processLegacyText(text);
this.text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT));
this.summaryText = extras.getCharSequence(EXTRA_SUB_TEXT);
return this;
}