diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/BackgroundUserSoundNotifier.java | 6 | ||||
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/pm/BackgroundUserSoundNotifierTest.java | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/BackgroundUserSoundNotifier.java b/services/core/java/com/android/server/pm/BackgroundUserSoundNotifier.java index 5aea356a4173..49a6ffde6783 100644 --- a/services/core/java/com/android/server/pm/BackgroundUserSoundNotifier.java +++ b/services/core/java/com/android/server/pm/BackgroundUserSoundNotifier.java @@ -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); + } } /** diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundUserSoundNotifierTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundUserSoundNotifierTest.java index 3062d5120e6f..9ba272446689 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundUserSoundNotifierTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/BackgroundUserSoundNotifierTest.java @@ -172,6 +172,7 @@ public class BackgroundUserSoundNotifierTest { mBackgroundUserSoundNotifier.muteAlarmSounds(mSpiedContext); verify(apc1.getPlayerProxy()).stop(); + verify(mockAudioPolicy).sendFocusLossAndUpdate(afi); verify(apc2.getPlayerProxy(), never()).stop(); } |