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

am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread

Browse Source 
Merge commit '1e2df14a85f098d63b618531db733a21429d4037'

* commit '1e2df14a85f098d63b618531db733a21429d4037':
  Handle OPTIONS requests from SIP servers.
This commit is contained in:
Chung-yih Wang
2010-09-23 21:39:49 -07:00
committed by Android Git Automerger
parent 0eb74130ac 1e2df14a85
commit 01a411326e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/sip/SipSessionGroup.java
View File

@@ -349,6 +349,9 @@ class SipSessionGroup implements SipListener {
mProxy.onRinging(newSession, newSession.mPeerProfile,
newSession.mPeerSessionDescription);
return true;
} else if (isRequestEvent(Request.OPTIONS, evt)) {
mSipHelper.sendResponse((RequestEvent) evt, Response.OK);
return true;
} else {
return false;
}
@@ -625,6 +628,9 @@ class SipSessionGroup implements SipListener {
(TransactionTerminatedEvent) evt);
}
return true;
} else if (isRequestEvent(Request.OPTIONS, evt)) {
mSipHelper.sendResponse((RequestEvent) evt, Response.OK);
return true;
} else if (evt instanceof DialogTerminatedEvent) {
processDialogTerminated((DialogTerminatedEvent) evt);
return true;