From 12750701d0f90ed0166f5ddcf588c1235efe830a Mon Sep 17 00:00:00 2001 From: Hung-ying Tyan Date: Thu, 23 Jun 2011 18:23:09 +0800 Subject: [PATCH] Keep the keepalive process going after NAT port is changed. This is a regression from the CL that makes the keep-alive process a reusable component. Change-Id: I1d580588e9e303c532bf620056fc0fe88a2fdcda --- voip/java/com/android/server/sip/SipService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/voip/java/com/android/server/sip/SipService.java b/voip/java/com/android/server/sip/SipService.java index 802e56d7de2d4..f8e5b3a383e51 100644 --- a/voip/java/com/android/server/sip/SipService.java +++ b/voip/java/com/android/server/sip/SipService.java @@ -890,6 +890,12 @@ public final class SipService extends ISipService.Stub { startPortMappingLifetimeMeasurement(mSession.getLocalProfile()); if (!mRunning || !portChanged) return; + + // The keep alive process is stopped when port is changed; + // Nullify the session so that the process can be restarted + // again when the re-registration is done + mKeepAliveSession = null; + // Acquire wake lock for the registration process. The // lock will be released when registration is complete. mMyWakeLock.acquire(mSession);