diff options
| author | repo sync <chiachi@android.com> | 2010-09-02 09:26:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-02 09:26:24 -0700 |
| commit | eaa511fd03e01bdae2bc09e2f29b51f76f64e0d7 (patch) | |
| tree | c3e8d2e95c9b567b224a3828c2247992fb34b82c /voip/java/android/net/sip/ISipSession.aidl | |
| parent | 0525f95bb11765e074d4f67b90bd0fc6aa34d6b3 (diff) | |
| parent | 3d67c5688f4855acbfd6de103b278ceee74a4451 (diff) | |
Merge "resolved conflicts for merge of 12eaf9d5 to master"
Diffstat (limited to 'voip/java/android/net/sip/ISipSession.aidl')
| -rw-r--r-- | voip/java/android/net/sip/ISipSession.aidl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/voip/java/android/net/sip/ISipSession.aidl b/voip/java/android/net/sip/ISipSession.aidl index fbcb056d46bf..1a23527988ea 100644 --- a/voip/java/android/net/sip/ISipSession.aidl +++ b/voip/java/android/net/sip/ISipSession.aidl @@ -115,8 +115,7 @@ interface ISipSession { * @param sessionDescription the session description of this call * @see ISipSessionListener */ - void makeCall(in SipProfile callee, - in SessionDescription sessionDescription); + void makeCall(in SipProfile callee, String sessionDescription); /** * Answers an incoming call with the specified session description. The @@ -125,7 +124,7 @@ interface ISipSession { * * @param sessionDescription the session description to answer this call */ - void answerCall(in SessionDescription sessionDescription); + void answerCall(String sessionDescription); /** * Ends an established call, terminates an outgoing call or rejects an @@ -143,5 +142,5 @@ interface ISipSession { * * @param sessionDescription the new session description */ - void changeCall(in SessionDescription sessionDescription); + void changeCall(String sessionDescription); } |