Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 928debf5: Merge "IMS call merge call-back changes." into lmp-mr1-dev automerge: cf96936

Browse Source 
* commit '928debf59a1c8249a6a502574f806955f2a166cc':
  IMS call merge call-back changes.
This commit is contained in:
Tyler Gunn
2014-10-24 23:03:06 +00:00
committed by Android Git Automerger
parent 60302f1938 928debf59a
commit c313c441b5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/com/android/ims/internal/IImsCallSession.aidl
View File

@@ -160,10 +160,13 @@ interface IImsCallSession {
void resume(in ImsStreamMediaProfile profile); void resume(in ImsStreamMediaProfile profile);
/** /**
* Merges the active & hold call. When it succeeds, {@link Listener#callSessionMerged} * Merges the active & hold call. When the merge starts,
* is called. * {@link Listener#callSessionMergeStarted} is called.
* {@link Listener#callSessionMergeComplete} is called if the merge is successful, and
* {@link Listener#callSessionMergeFailed} is called if the merge fails.
* *
* @see Listener#callSessionMerged, Listener#callSessionMergeFailed * @see Listener#callSessionMergeStarted, Listener#callSessionMergeComplete,
* Listener#callSessionMergeFailed
*/ */
void merge(); void merge();

5
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
View File

@@ -48,10 +48,11 @@ interface IImsCallSessionListener {
void callSessionResumeReceived(in IImsCallSession session, in ImsCallProfile profile); void callSessionResumeReceived(in IImsCallSession session, in ImsCallProfile profile);
/** /**
* Notifiies the result of call merge operation. * Notifies the result of call merge operation.
*/ */
void callSessionMerged(in IImsCallSession session, void callSessionMergeStarted(in IImsCallSession session,
in IImsCallSession newSession, in ImsCallProfile profile); in IImsCallSession newSession, in ImsCallProfile profile);
void callSessionMergeComplete(in IImsCallSession session);
void callSessionMergeFailed(in IImsCallSession session, void callSessionMergeFailed(in IImsCallSession session,
in ImsReasonInfo reasonInfo); in ImsReasonInfo reasonInfo);