commit | d285e130ba4b262822d8eec81a8c4f99f90f619b | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Apr 30 23:04:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 30 23:04:12 2021 +0000 |
tree | 0c7c86c880ab0620985be9bc2c5d41a0b6bf2799 | |
parent | cfb90d14f450728ea7a862eb65b0cf6d4602bd49 [diff] | |
parent | f15354a13c794ac41891711d267254b63431cee5 [diff] |
Merge "Fix incorrect usage of lock object" am: d09e4c7bbe am: a47acb652e am: f15354a13c Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1379176 Change-Id: Ia7b98b3f7b3cf711aaacbd306aae9be7d316b8e4
diff --git a/src/com/android/server/telecom/InCallTonePlayer.java b/src/com/android/server/telecom/InCallTonePlayer.java index 7500436..524d119 100644 --- a/src/com/android/server/telecom/InCallTonePlayer.java +++ b/src/com/android/server/telecom/InCallTonePlayer.java
@@ -439,7 +439,7 @@ @Override public void onCompletion(MediaPlayer mp) { Log.i(this, "playMediaTone: toneResourceId=%d completed.", toneResourceId); - synchronized (this) { + synchronized (InCallTonePlayer.this) { mState = STATE_OFF; } mToneMediaPlayer.release();