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

Commit f43ac911 authored by Chung-yih Wang's avatar Chung-yih Wang Committed by Android (Google) Code Review
Browse files

Merge "Handle OPTIONS requests from SIP servers." into gingerbread

parents 287952c3 0b4d2fb1

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

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