Commit a6faa58a authored Apr 25, 2022 by Tyler Gunn Committed by Automerger Merge Worker Apr 25, 2022

Merge "Fix issue where InCallTonePlayer could fail to stop ringback." into...

Merge "Fix issue where InCallTonePlayer could fail to stop ringback." into tm-dev am: 0c3e45d6 am: 61a974dc

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

Change-Id: I4b5fa87530326fea1c6ac0c5429e61619b60a8ed
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -510,11 +510,10 @@ public class InCallTonePlayer extends Thread {
		*/
		@VisibleForTesting
		public void stopTone() {
		if (mState == STATE_ON) {
		Log.i(this, "stopTone: Stopping the tone %d.", mToneId);
		// Notify the playback to end early.
		mPlaybackLatch.countDown();
		}

		mState = STATE_STOPPED;
		}