diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-09-06 13:56:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 13:56:54 -0700 |
| commit | 1694dd095bc945662711930b4cb283a8b54b76dd (patch) | |
| tree | c6f4098ce2d01586495639db3c8d66c1c99871f4 | |
| parent | 1ed7a407fafe50b1eb0878f560bb0618706e4e82 (diff) | |
| parent | 54eabd6c929c6f56da28421839b0ef2945cda876 (diff) | |
| download | frameworks_base-1694dd095bc945662711930b4cb283a8b54b76dd.zip frameworks_base-1694dd095bc945662711930b4cb283a8b54b76dd.tar.gz frameworks_base-1694dd095bc945662711930b4cb283a8b54b76dd.tar.bz2 | |
Merge "SIP: avoid extreme small values in Min-Expires headers."
| -rw-r--r-- | voip/java/com/android/server/sip/SipSessionGroup.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/voip/java/com/android/server/sip/SipSessionGroup.java b/voip/java/com/android/server/sip/SipSessionGroup.java index 49effa8..eb5cce7 100644 --- a/voip/java/com/android/server/sip/SipSessionGroup.java +++ b/voip/java/com/android/server/sip/SipSessionGroup.java @@ -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) |