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

Commit 1e2df14a authored by Chung-yih Wang's avatar Chung-yih Wang Committed by Android Git Automerger
Browse files

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

Merge commit 'f43ac911' into gingerbread-plus-aosp

* commit 'f43ac911':
  Handle OPTIONS requests from SIP servers.
parents 8952a448 f43ac911

services/java/com/android/server/sip/SipSessionGroup.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -349,6 +349,9 @@ class SipSessionGroup implements SipListener { 
                mProxy.onRinging(newSession, newSession.mPeerProfile,

                mProxy.onRinging(newSession, newSession.mPeerProfile,

                        newSession.mPeerSessionDescription);

                        newSession.mPeerSessionDescription);

                return true;

                return true;

            } else if (isRequestEvent(Request.OPTIONS, evt)) {

                mSipHelper.sendResponse((RequestEvent) evt, Response.OK);

                return true;

            } else {

            } else {

                return false;

                return false;

            }

            }
@@ -625,6 +628,9 @@ class SipSessionGroup implements SipListener { 
                            (TransactionTerminatedEvent) evt);

                            (TransactionTerminatedEvent) evt);

                }

                }

                return true;

                return true;

            } else if (isRequestEvent(Request.OPTIONS, evt)) {

                mSipHelper.sendResponse((RequestEvent) evt, Response.OK);

                return true;

            } else if (evt instanceof DialogTerminatedEvent) {

            } else if (evt instanceof DialogTerminatedEvent) {

                processDialogTerminated((DialogTerminatedEvent) evt);

                processDialogTerminated((DialogTerminatedEvent) evt);

                return true;

                return true;