Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a48258 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am:... 

Merge "Merge "Fix wrong Notification refactor" into qt-qpr1-dev am: 9c743a22" into qt-qpr1-dev-plus-aosp
am: 33094b44

Change-Id: I808e7fb137d8a7e3e7d67235db4adecdb0fc23dc
parents 4a5e616d 33094b44

core/java/android/app/Notification.java

+1 −6
Original line number Diff line number Diff line
@@ -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;

        }