commit c7a6056e3ac5111238ed1061d0c2a18f3febcd53
author Chia-chi Yeh <chiachi@android.com> Fri May 04 09:19:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 04 09:19:18 2012 -0700
tree 8052be9310d1e24ea58d416969496fe5a385de45
parent fba8fdc6c588873aa944d7aa79b2f12ade78566a
parent 15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9

am 15b085f8: Merge "Fix issue that VPN connection fail when L2TP secret enable"

* commit '15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9':
  Fix issue that VPN connection fail when L2TP secret enable

mtpd.c

diff --git a/mtpd.c b/mtpd.c
index cff5712..c005567 100644
--- a/mtpd.c
+++ b/mtpd.c
@@ -199,13 +199,16 @@
         if (pollfds[2].revents) {
             interrupt(SIGTERM);
         }
+        timeout = pollfds[0].revents ?
+                the_protocol->process() : the_protocol->timeout();
 #ifdef ANDROID_CHANGES
         if (!access("/data/misc/vpn/abort", F_OK)) {
             interrupt(SIGTERM);
         }
+        if (!timeout) {
+            timeout = 5000;
+        }
 #endif
-        timeout = pollfds[0].revents ?
-                the_protocol->process() : the_protocol->timeout();
     }
 
     if (timeout < 0) {