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

Commit a0d3e89e authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Drop AudioFocusInfo if the FG user chooses to mute it. 

Bug: 355596432
Bug: 355576058
Test: atest BackgroundUserSoundNotifierTest
Flag: EXEMPT bugfix
Change-Id: I61b8870facb0971ccb5eb79c2597b0198848371e
parent 68cc2e2a

services/core/java/com/android/server/pm/BackgroundUserSoundNotifier.java

+6 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ public class BackgroundUserSoundNotifier { 
    /**

     * Stop player proxy for the ongoing alarm and drop focus for its AudioFocusInfo.

     */

    @SuppressLint("MissingPermission")

    @VisibleForTesting

    void muteAlarmSounds(Context context) {

        AudioManager audioManager = context.getSystemService(AudioManager.class);
@@ -201,6 +202,11 @@ public class BackgroundUserSoundNotifier { 
                }

            }

        }



        AudioFocusInfo currentAfi = getAudioFocusInfoForNotification();

        if (currentAfi != null) {

            mFocusControlAudioPolicy.sendFocusLossAndUpdate(currentAfi);

        }

    }



    /**

services/tests/mockingservicestests/src/com/android/server/pm/BackgroundUserSoundNotifierTest.java

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ public class BackgroundUserSoundNotifierTest { 
        mBackgroundUserSoundNotifier.muteAlarmSounds(mSpiedContext);



        verify(apc1.getPlayerProxy()).stop();

        verify(mockAudioPolicy).sendFocusLossAndUpdate(afi);

        verify(apc2.getPlayerProxy(), never()).stop();

    }