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

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

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

parents 0c36573a a6b653f2

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

+6 −3
Original line number Diff line number Diff line
@@ -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;

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -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