Merge "Add ringer logging to telecom." into mnc-dev (2ebf0b73) · Commits · e / os / android_packages_services_Telecomm

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,8 @@ public class Log {
		public static final String REQUEST_REJECT = "REQUEST_REJECT";
		public static final String START_DTMF = "START_DTMF";
		public static final String STOP_DTMF = "STOP_DTMF";
		public static final String START_RINGER = "START_RINGER";
		public static final String STOP_RINGER = "STOP_RINGER";

		/**
		* Maps from a request to a response. The same event could be listed as the
		@@ -199,6 +201,10 @@ public class Log {
		}

		public static void event(Call call, String event, Object data) {
		if (call == null) {
		Log.i(TAG, "Non-call EVENT: %s, %s", event, data);
		return;
		}
		synchronized (mCallEventRecords) {
		if (!mCallEventRecordMap.containsKey(call)) {
		// First remove the oldest entry if no new ones exist.

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -133,7 +133,6 @@ final class Ringer extends CallsManagerListenerBase {
		void silence() {
		// Remove all calls from the "ringing" set and then update the ringer.
		mRingingCalls.clear();
		updateRinging();
		}

		private void onRespondedToIncomingCall(Call call) {
		@@ -159,7 +158,7 @@ final class Ringer extends CallsManagerListenerBase {

		private void updateRinging() {
		if (mRingingCalls.isEmpty()) {
		stopRinging();
		stopRinging("No more ringing calls found");
		stopCallWaiting();
		} else {
		startRingingOrCallWaiting();
		@@ -181,7 +180,7 @@ final class Ringer extends CallsManagerListenerBase {
		AudioManager audioManager =
		(AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
		if (audioManager.getStreamVolume(AudioManager.STREAM_RING) > 0) {
		Log.v(this, "startRingingOrCallWaiting");
		Log.event(foregroundCall, Log.Events.START_RINGER);
		mCallAudioManager.setIsRinging(true);

		// Because we wait until a contact info query to complete before processing a
		@@ -206,7 +205,7 @@ final class Ringer extends CallsManagerListenerBase {
		Log.v(this, "Playing call-waiting tone.");

		// All incoming calls are in background so play call waiting.
		stopRinging();
		stopRinging("Stop for call-waiting");

		if (mCallWaitingPlayer == null) {
		mCallWaitingPlayer =
		@@ -226,8 +225,8 @@ final class Ringer extends CallsManagerListenerBase {
		return manager.matchesCallFilter(extras);
		}

		private void stopRinging() {
		Log.v(this, "stopRinging");
		private void stopRinging(String reasonTag) {
		Log.event(mCallsManager.getForegroundCall(), Log.Events.STOP_RINGER, reasonTag);

		mRingtonePlayer.stop();

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -472,6 +472,7 @@ public class TelecomServiceImpl {

		long token = Binder.clearCallingIdentity();
		try {
		Log.i(this, "Silence Ringer requested by %s", callingPackage);
		mCallsManager.getRinger().silence();
		} finally {
		Binder.restoreCallingIdentity(token);