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

Commit ffe9e304 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix the tones playing count in InCallTonePlayer" am: 3fa4d5b0 am:... 

Merge "Fix the tones playing count in InCallTonePlayer" am: 3fa4d5b0 am: 81e075b9 am: 57e0c60f

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2328653



Change-Id: I76f6546100b64c2d0206cc04427bc4e012c8b0b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f14fef3 57e0c60f

src/com/android/server/telecom/InCallTonePlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ public class InCallTonePlayer extends Thread { 
        mMainThreadHandler.post(new Runnable("ICTP.cUTP", mLock) {

            @Override

            public void loggedRun() {

                int newToneCount = sTonesPlaying.updateAndGet( t -> Math.min(0, t--));

                int newToneCount = sTonesPlaying.updateAndGet( t -> Math.max(0, --t));



                if (newToneCount == 0) {

                    Log.i(InCallTonePlayer.this,