From a6b653f2d85bec4dc08df0657f892b55fdef5056 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 9 Mar 2020 11:26:19 -0400 Subject: [PATCH] Mute new assistant stream in total silence mode Test: atest Fixes: 149220546 Change-Id: I4e263717c9d4e8187376e141927d2b5616a14eb3 --- .../com/android/server/notification/ZenModeHelper.java | 9 ++++++--- .../android/server/notification/ZenModeHelperTest.java | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 2853956d0a796..d862e4f6cdaa6 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -1278,13 +1278,16 @@ public class ZenModeHelper { (1 << AudioSystem.STREAM_SYSTEM); if (mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS) { - // alarm and music streams affected by ringer mode (cannot be adjusted) when in + // alarm and music and streams affected by ringer mode (cannot be adjusted) when in // total silence streams |= (1 << AudioSystem.STREAM_ALARM) | - (1 << AudioSystem.STREAM_MUSIC); + (1 << AudioSystem.STREAM_MUSIC) | + (1 << AudioSystem.STREAM_ASSISTANT); } else { streams &= ~((1 << AudioSystem.STREAM_ALARM) | - (1 << AudioSystem.STREAM_MUSIC)); + (1 << AudioSystem.STREAM_MUSIC) | + (1 << AudioSystem.STREAM_ASSISTANT) + ); } return streams; } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index cee486fbb4e3b..108af892c7ddf 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -559,6 +559,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_SYSTEM)) != 0); assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_ALARM)) != 0); assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_MUSIC)) != 0); + assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_ASSISTANT)) != 0); } @Test @@ -579,6 +580,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_SYSTEM)) != 0); assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_ALARM)) == 0); assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_MUSIC)) == 0); + assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_ASSISTANT)) == 0); // even when ringer is muted (since all ringer sounds cannot bypass DND), // system stream is still affected by ringer mode @@ -601,6 +603,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { != 0); assertTrue((ringerMutedRingerModeAffectedStreams & (1 << AudioSystem.STREAM_ALARM)) == 0); assertTrue((ringerMutedRingerModeAffectedStreams & (1 << AudioSystem.STREAM_MUSIC)) == 0); + assertTrue((ringerModeAffectedStreams & (1 << AudioSystem.STREAM_ASSISTANT)) == 0); } @Test