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

Merge "IMS call merge call-back changes." into lmp-mr1-dev

Browse Source
This commit is contained in:
Tyler Gunn
2014-10-24 21:10:40 +00:00
committed by Android (Google) Code Review
parent e20dd304b7 f764e80757
commit cf96936966
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);
/**
* Merges the active & hold call. When it succeeds, {@link Listener#callSessionMerged}
* is called.
* Merges the active & hold call. When the merge starts,
* {@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();

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);
/**
* 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);
void callSessionMergeComplete(in IImsCallSession session);
void callSessionMergeFailed(in IImsCallSession session,
in ImsReasonInfo reasonInfo);