commit 9dbe2c72276b9968593054dcfd39fd5135a574aa
author Hung-ying Tyan <tyanh@google.com> Thu Jun 23 18:23:09 2011 +0800
committer Hung-ying Tyan <tyanh@google.com> Thu Jun 23 18:23:09 2011 +0800
tree 395bab01a793c34b00ebaea827fb201daa09f9c0
parent 8a044dee1690c3dc7b5f467461ce4fa65c565a66

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

java/com/android/server/sip/SipService.java

diff --git a/java/com/android/server/sip/SipService.java b/java/com/android/server/sip/SipService.java
index 802e56d..f8e5b3a 100644
--- a/java/com/android/server/sip/SipService.java
+++ b/java/com/android/server/sip/SipService.java
@@ -890,6 +890,12 @@
                 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);