am f8d97800: Pass current call into CallAudioManager#setIsRinging. (ede21c0b) · Commits · e / os / android_packages_services_Telecomm

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -360,12 +360,17 @@ final class CallAudioManager extends CallsManagerListenerBase
		}
		}

		void setIsRinging(boolean isRinging) {
		/**
		* Sets the audio stream and mode based on whether a call is ringing.
		*
		* @param call The call which changed ringing state.
		* @param isRinging {@code true} if the call is ringing, {@code false} otherwise.
		*/
		void setIsRinging(Call call, boolean isRinging) {
		if (mIsRinging != isRinging) {
		Log.i(this, "setIsRinging %b -> %b", mIsRinging, isRinging);
		Log.i(this, "setIsRinging %b -> %b (call = %s)", mIsRinging, isRinging, call);
		mIsRinging = isRinging;

		updateAudioStreamAndMode();
		updateAudioStreamAndMode(call);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ final class Ringer extends CallsManagerListenerBase {
		Log.event(call, Log.Events.START_RINGER);
		mState = STATE_RINGING;
		}
		mCallAudioManager.setIsRinging(true);
		mCallAudioManager.setIsRinging(call, true);

		// Because we wait until a contact info query to complete before processing a
		// call (for the purposes of direct-to-voicemail), the information about custom
		@@ -261,7 +261,7 @@ final class Ringer extends CallsManagerListenerBase {

		// Even though stop is asynchronous it's ok to update the audio manager. Things like audio
		// focus are voluntary so releasing focus too early is not detrimental.
		mCallAudioManager.setIsRinging(false);
		mCallAudioManager.setIsRinging(call, false);
		}

		private void stopCallWaiting(Call call) {