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

Commit 11059667 authored by luochaojiang's avatar luochaojiang Committed by android-build-merger
Browse files

Merge "Stop InCall Notification to avoid track leak" 

am: b47c9019

Change-Id: I1bf6b52a8a82ddc5880871344a8f5af53ebf8322
parents d54852ab b47c9019

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

+6 −1
Original line number Diff line number Diff line
@@ -314,6 +314,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();
@@ -4232,7 +4233,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);

                    }