Merge "Drop AudioFocusInfo if the FG user chooses to mute it." into main (24d4d956) · Commits · e / os / android_frameworks_base

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

		/**

+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();
		}