Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mute new assistant stream in total silence mode" into rvc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2020-03-19 14:35:04 +00:00
committed by Android (Google) Code Review
parent 0c36573a57 a6b653f2d8
commit 3a79134233
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -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;
}

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

@@ -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