diff options
| author | Lucas Dupin <dupin@google.com> | 2019-09-25 15:57:15 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 15:57:15 -0700 |
| commit | 16a4825807d4313e960343700e99e2238c5d6ae1 (patch) | |
| tree | c8e287e790ee4fae08838d85841efc27321250f7 /core/java/android/app/Notification.java | |
| parent | 4a5e616d9f32f532a6125c0649bde23438678bb9 (diff) | |
| parent | 33094b44d8277165f65a68c22076b12300437296 (diff) | |
Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am: 9c743a222d" into qt-qpr1-dev-plus-aosp
am: 33094b44d8
Change-Id: I808e7fb137d8a7e3e7d67235db4adecdb0fc23dc
Diffstat (limited to 'core/java/android/app/Notification.java')
| -rw-r--r-- | core/java/android/app/Notification.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 2f03ed484e96..efb9f6bb88f1 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -10511,12 +10511,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; } |