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

Commit f9a61c72 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect usage of lock object" am: d09e4c7b am: a47acb65 am:... 

Merge "Fix incorrect usage of lock object" am: d09e4c7b am: a47acb65 am: f15354a1 am: d285e130

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

Change-Id: Icf2bd11b465efe9d82f07cc9dcc27afa0902b128
parents 0f34b958 d285e130

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

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ public class InCallTonePlayer extends Thread { 
                @Override

                public void onCompletion(MediaPlayer mp) {

                    Log.i(this, "playMediaTone: toneResourceId=%d completed.", toneResourceId);

                    synchronized (this) {

                    synchronized (InCallTonePlayer.this) {

                        mState = STATE_OFF;

                    }

                    mToneMediaPlayer.release();