diff options
author | Tyler Gunn <tgunn@google.com> | 2014-10-24 14:06:40 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2014-10-24 14:06:40 -0700 |
commit | f764e8075775f84df0c5c51a529548ba64707517 (patch) | |
tree | 58b195bc4bf3c687fb936d4ae7b7f726d1d5bbc9 /telephony/java/com | |
parent | 3682ced751ee86f87a0af84a17f027e134c2f23e (diff) | |
download | frameworks_base-f764e8075775f84df0c5c51a529548ba64707517.zip frameworks_base-f764e8075775f84df0c5c51a529548ba64707517.tar.gz frameworks_base-f764e8075775f84df0c5c51a529548ba64707517.tar.bz2 |
IMS call merge call-back changes.
Renaming callSessionMerged to callSessionMergeStarted.
Adding callSessionMergeComplete callback for when merge successfully
completes.
Bug: 18056632
Change-Id: I8fc73b6c9db5e7970de81d8c3e09abc80f1a262f
Diffstat (limited to 'telephony/java/com')
-rw-r--r-- | telephony/java/com/android/ims/internal/IImsCallSession.aidl | 9 | ||||
-rw-r--r-- | telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/telephony/java/com/android/ims/internal/IImsCallSession.aidl b/telephony/java/com/android/ims/internal/IImsCallSession.aidl index 2cf7208..16b0cd5 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSession.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSession.aidl @@ -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(); diff --git a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl index 11da6e6..84d1c545 100644 --- a/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl @@ -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); |