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

Commit 0cb10d82 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Prevent background noises when DND is on 

If any call settings are blocked by the current DND mode,
restrict all call related audio usages

Test: ZenModeHelperTest
Flag: EXEMPT bugfix
Fixes: 369603676
Change-Id: I672b649f2f243023424a71e2234323c48711b497
parent d9b1b338

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

+1 −1
Original line number Diff line number Diff line
@@ -2395,7 +2395,7 @@ public class ZenModeHelper { 
                || (mSuppressedEffects & SUPPRESSED_EFFECT_NOTIFICATIONS) != 0;

        // call restrictions

        final boolean muteCalls = zenAlarmsOnly

                || (zenPriorityOnly && !(allowCalls || allowRepeatCallers))

                || (zenPriorityOnly && (!allowCalls || !allowRepeatCallers))

                || (mSuppressedEffects & SUPPRESSED_EFFECT_CALLS) != 0;

        // alarm restrictions

        final boolean muteAlarms = zenPriorityOnly && !allowAlarms;

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

+17 −1
Original line number Diff line number Diff line
@@ -492,6 +492,22 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
                AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT);

    }



    @Test

    public void testZenOn_RepeatCallers_CallTypesBlocked() {

        mZenModeHelper.mZenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelper.setPriorityOnlyDndExemptPackages(new String[]{PKG_O});

        // Any call allowed but no repeat callers

        mZenModeHelper.mConsolidatedPolicy = new Policy(PRIORITY_CATEGORY_CALLS,

                PRIORITY_SENDERS_ANY, 0, 0, 0);

        mZenModeHelper.applyRestrictions();



        verifyApplyRestrictions(true, true,

                AudioAttributes.USAGE_NOTIFICATION_RINGTONE);

        verifyApplyRestrictions(true, true,

                AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST);

    }





    @Test

    public void testZenOn_StarredCallers_CallTypesBlocked() {

        mZenModeHelper.mZenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
@@ -501,7 +517,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
                | PRIORITY_CATEGORY_MEDIA | PRIORITY_CATEGORY_MESSAGES

                | PRIORITY_CATEGORY_CONVERSATIONS | PRIORITY_CATEGORY_CALLS

                | PRIORITY_CATEGORY_ALARMS | PRIORITY_CATEGORY_EVENTS | PRIORITY_CATEGORY_REMINDERS

                | PRIORITY_CATEGORY_SYSTEM,

                | PRIORITY_CATEGORY_SYSTEM | PRIORITY_CATEGORY_REPEAT_CALLERS,

                PRIORITY_SENDERS_STARRED,

                PRIORITY_SENDERS_ANY, 0, CONVERSATION_SENDERS_ANYONE);

        mZenModeHelper.applyRestrictions();