Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 928debf5 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

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

automerge: cf969369

* commit 'cf969369':
  IMS call merge call-back changes.
parents 31deee5e cf969369

telephony/java/com/android/ims/internal/IImsCallSession.aidl

+6 −3
Original line number Diff line number Diff line
@@ -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();

telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl

+3 −2
Original line number Diff line number Diff line
@@ -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);