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

Commit 410959db authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Mute new assistant stream in total silence mode" into rvc-dev am: 3a791342 am: b84902de 

Change-Id: I8ac47f342abfffd43b900c29b016f51346a43a0d
parents a557291f b84902de

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