Merge "Merge "Stop InCall Notification to avoid track leak" am: b47c9019b5 am:... (e89aa91d) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -348,6 +348,7 @@ public class NotificationManagerService extends SystemService {
		private Uri mInCallNotificationUri;
		private AudioAttributes mInCallNotificationAudioAttributes;
		private float mInCallNotificationVolume;
		private Binder mCallNotificationToken = null;

		// used as a mutex for access to all active notifications & listeners
		final Object mNotificationLock = new Object();
		@@ -4875,7 +4876,11 @@ public class NotificationManagerService extends SystemService {
		try {
		final IRingtonePlayer player = mAudioManager.getRingtonePlayer();
		if (player != null) {
		player.play(new Binder(), mInCallNotificationUri,
		if (mCallNotificationToken != null) {
		player.stop(mCallNotificationToken);
		}
		mCallNotificationToken = new Binder();
		player.play(mCallNotificationToken, mInCallNotificationUri,
		mInCallNotificationAudioAttributes,
		mInCallNotificationVolume, false);
		}