Merge "Ensure calls are audible upon starting" into pi-dev (b2ffa6b3) · Commits · e / os / android_packages_services_Telecomm

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.pm.UserInfo;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.media.AudioManager;
		import android.media.AudioSystem;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -1896,6 +1897,7 @@ public class CallsManager extends Call.ListenerBase
		setCallState(call, CallState.DIALING, "dialing set explicitly");
		maybeMoveToSpeakerPhone(call);
		maybeTurnOffMute(call);
		ensureCallAudible();
		}

		void markCallAsPulling(Call call) {
		@@ -1949,6 +1951,7 @@ public class CallsManager extends Call.ListenerBase
		} else {
		setCallState(call, CallState.ACTIVE, "active set explicitly");
		maybeMoveToSpeakerPhone(call);
		ensureCallAudible();
		}
		}

		@@ -2945,6 +2948,19 @@ public class CallsManager extends Call.ListenerBase
		}
		}

		private void ensureCallAudible() {
		AudioManager am = mContext.getSystemService(AudioManager.class);
		if (am == null) {
		Log.w(this, "ensureCallAudible: audio manager is null");
		return;
		}
		if (am.getStreamVolume(AudioManager.STREAM_VOICE_CALL) == 0) {
		Log.i(this, "ensureCallAudible: voice call stream has volume 0. Adjusting to default.");
		am.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
		AudioSystem.getDefaultStreamVolume(AudioManager.STREAM_VOICE_CALL), 0);
		}
		}

		/**
		* Creates a new call for an existing connection.
		*