am 4143b796
: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
* commit '4143b796bc20072a12fe31cbfdf4f1918dff0728': Fixing conference merge where only one party is added to conference.
This commit is contained in:
@ -30037,6 +30037,7 @@ package android.telecom {
|
|||||||
method public final int getState();
|
method public final int getState();
|
||||||
method public final android.telecom.StatusHints getStatusHints();
|
method public final android.telecom.StatusHints getStatusHints();
|
||||||
method public final boolean isRingbackRequested();
|
method public final boolean isRingbackRequested();
|
||||||
|
method protected void notifyConferenceStarted();
|
||||||
method public void onAbort();
|
method public void onAbort();
|
||||||
method public void onAnswer();
|
method public void onAnswer();
|
||||||
method public void onAudioStateChanged(android.telecom.AudioState);
|
method public void onAudioStateChanged(android.telecom.AudioState);
|
||||||
|
@ -260,6 +260,7 @@ public abstract class Connection implements IConferenceable {
|
|||||||
/** @hide */
|
/** @hide */
|
||||||
public void onConferenceParticipantsChanged(Connection c,
|
public void onConferenceParticipantsChanged(Connection c,
|
||||||
List<ConferenceParticipant> participants) {}
|
List<ConferenceParticipant> participants) {}
|
||||||
|
public void onConferenceStarted() {}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @hide */
|
/** @hide */
|
||||||
@ -1422,4 +1423,13 @@ public abstract class Connection implements IConferenceable {
|
|||||||
l.onConferenceParticipantsChanged(this, conferenceParticipants);
|
l.onConferenceParticipantsChanged(this, conferenceParticipants);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Notifies listeners that a conference call has been started.
|
||||||
|
*/
|
||||||
|
protected void notifyConferenceStarted() {
|
||||||
|
for (Listener l : mListeners) {
|
||||||
|
l.onConferenceStarted();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user