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

Commit b58d6efe authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge changes I984e796a,I4af61a72 into tm-qpr-dev am: 7dd9014b am: 0d0dfcd1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19358973



Change-Id: I26aea4d1095aaf80e0cdc90b2493de4ab7c6810c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3fec0f9 0d0dfcd1

packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ 
        <TextView

            android:id="@+id/entity_header_second_summary"

            style="@style/TextAppearance.EntityHeaderSummary"

            android:singleLine="false"

            android:maxLines="4"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

services/core/java/com/android/server/notification/NotificationManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -2460,11 +2460,11 @@ public class NotificationManagerService extends SystemService { 
        SnoozeHelper snoozeHelper = new SnoozeHelper(getContext(), (userId, r, muteOnReturn) -> {

            try {

                if (DBG) {

                    Slog.d(TAG, "Reposting " + r.getKey());

                    Slog.d(TAG, "Reposting " + r.getKey() + " " + muteOnReturn);

                }

                enqueueNotificationInternal(r.getSbn().getPackageName(), r.getSbn().getOpPkg(),

                        r.getSbn().getUid(), r.getSbn().getInitialPid(), r.getSbn().getTag(),

                        r.getSbn().getId(),  r.getSbn().getNotification(), userId, true);

                        r.getSbn().getId(),  r.getSbn().getNotification(), userId, muteOnReturn);

            } catch (Exception e) {

                Slog.e(TAG, "Cannot un-snooze notification", e);

            }