Merge "Conference event package performance improvement." into lmp-mr1-dev (fe1472a2) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/Connection.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ public abstract class Connection {
		public void onVideoProviderChanged(
		android.telecom.Connection.VideoProvider videoProvider);
		public void onAudioQualityChanged(int audioQuality);
		public void onConferenceParticipantChanged(ConferenceParticipant participant);
		public void onConferenceParticipantsChanged(List<ConferenceParticipant> participants);
		}

		/**
		@@ -66,7 +66,7 @@ public abstract class Connection {
		@Override
		public void onAudioQualityChanged(int audioQuality) {}
		@Override
		public void onConferenceParticipantChanged(ConferenceParticipant participant) {}
		public void onConferenceParticipantsChanged(List<ConferenceParticipant> participants) {}
		}

		public static final int AUDIO_QUALITY_STANDARD = 1;
		@@ -548,13 +548,13 @@ public abstract class Connection {
		}

		/**
		* Notifies listeners of a change to a conference participant.
		* Notifies listeners of a change to conference participant(s).
		*
		* @param conferenceParticipant The participant.
		* @param conferenceParticipants The participant(s).
		*/
		public void updateConferenceParticipant(ConferenceParticipant conferenceParticipant) {
		public void updateConferenceParticipants(List<ConferenceParticipant> conferenceParticipants) {
		for (Listener l : mListeners) {
		l.onConferenceParticipantChanged(conferenceParticipant);
		l.onConferenceParticipantsChanged(conferenceParticipants);
		}
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -1104,19 +1104,19 @@ public final class ImsPhoneCallTracker extends CallTracker {
		}

		/**
		* Called when the state of an IMS conference participant has changed.
		* Called when the state of IMS conference participant(s) has changed.
		*
		* @param call the call object that carries out the IMS call.
		* @param participant the participant and its new state information.
		* @param participants the participant(s) and their new state information.
		*/
		@Override
		public void onConferenceParticipantStateChanged(ImsCall call,
		ConferenceParticipant participant) {
		if (DBG) log("onConferenceParticipantStateChanged");
		public void onConferenceParticipantsStateChanged(ImsCall call,
		List<ConferenceParticipant> participants) {
		if (DBG) log("onConferenceParticipantsStateChanged");

		ImsPhoneConnection conn = findConnection(call);
		if (conn != null) {
		conn.updateConferenceParticipant(participant);
		conn.updateConferenceParticipants(participants);
		}
		}
		};