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

Commit 1694dd09 authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "SIP: avoid extreme small values in Min-Expires headers."

parents 1ed7a407 54eabd6c

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

+4 −1
Original line number Diff line number Diff line
@@ -883,12 +883,15 @@ class SipSessionGroup implements SipListener { 
            if (expires != null && (time < 0 || time > expires.getExpires())) {

                time = expires.getExpires();

            }

            if (time <= 0) {

                time = EXPIRY_TIME;

            }

            expires = (ExpiresHeader) response.getHeader(MinExpiresHeader.NAME);

            if (expires != null && time < expires.getExpires()) {

                time = expires.getExpires();

            }

            Log.v(TAG, "Expiry time = " + time);

            return (time > 0) ? time : EXPIRY_TIME;

            return time;

        }



        private boolean registeringToReady(EventObject evt)