Merge "Fixing conference merge where only one party is added to conference." (de550cea) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -30037,6 +30037,7 @@ package android.telecom {
		method public final int getState();
		method public final android.telecom.StatusHints getStatusHints();
		method public final boolean isRingbackRequested();
		method protected void notifyConferenceStarted();
		method public void onAbort();
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecom.AudioState);

+10 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public abstract class Connection implements IConferenceable {
		public void onConferenceParticipantsChanged(Connection c,
		List<ConferenceParticipant> participants) {}
		public void onCdmaConnectionTimeReset(Connection c) {}
		public void onConferenceStarted() {}
		}

		/** @hide */
		@@ -1645,4 +1646,13 @@ public abstract class Connection implements IConferenceable {
		l.onConferenceParticipantsChanged(this, conferenceParticipants);
		}
		}

		/**
		* Notifies listeners that a conference call has been started.
		*/
		protected void notifyConferenceStarted() {
		for (Listener l : mListeners) {
		l.onConferenceStarted();
		}
		}
		}