commit c1872732922214de80f790e14865e41dd1b98203
author Chia-chi Yeh <chiachi@android.com> Thu Dec 08 16:51:41 2011 -0800
committer Chia-chi Yeh <chiachi@android.com> Thu Dec 08 16:51:41 2011 -0800
tree 6fecd1c6d1b7eba52b069df35168402063894255
parent 68f592a8210af27df4339089bbee47fb602cae6a

VPN: delete the "abort" file before starting VPN daemons.

Bug: 5714296
Change-Id: Idba41b9f3907747a84387ea4f3e930b3a185a06e

services/java/com/android/server/connectivity/Vpn.java

diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index 55e0678..72cf512 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -482,6 +482,7 @@
                 if (state.exists()) {
                     throw new IllegalStateException("Cannot delete the state");
                 }
+                new File("/data/misc/vpn/abort").delete();
 
                 // Check if we need to restart any of the daemons.
                 boolean restart = false;