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

Commit 15b7ea87 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix stream reassignment for alarm notifications" into main

parents 20f66083 9cc4ae73

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class NotificationChannelExtractor implements NotificationSignalExtractor 
                updateAttributes = true;

            }

            if (restrictAudioAttributesAlarm()

                    && record.getNotification().category != CATEGORY_ALARM

                    && !CATEGORY_ALARM.equals(record.getNotification().category)

                    && attributes.getUsage() == AudioAttributes.USAGE_ALARM) {

                updateAttributes = true;

            }

services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class NotificationChannelExtractorTest extends UiServiceTestCase { 
                .build());

        final Notification n = new Notification.Builder(getContext())

                .setContentTitle("foo")

                .setCategory(CATEGORY_ALARM)

                .setCategory(new String("alarm"))

                .setSmallIcon(android.R.drawable.sym_def_app_icon)

                .build();

        NotificationRecord r = getRecord(channel, n);