diff options
author | Chia-chi Yeh <chiachi@android.com> | 2011-12-08 16:51:41 -0800 |
---|---|---|
committer | Chia-chi Yeh <chiachi@android.com> | 2011-12-08 16:51:41 -0800 |
commit | c1872732922214de80f790e14865e41dd1b98203 (patch) | |
tree | 6fecd1c6d1b7eba52b069df35168402063894255 /services | |
parent | 68f592a8210af27df4339089bbee47fb602cae6a (diff) | |
download | frameworks_base-c1872732922214de80f790e14865e41dd1b98203.zip frameworks_base-c1872732922214de80f790e14865e41dd1b98203.tar.gz frameworks_base-c1872732922214de80f790e14865e41dd1b98203.tar.bz2 |
VPN: delete the "abort" file before starting VPN daemons.
Bug: 5714296
Change-Id: Idba41b9f3907747a84387ea4f3e930b3a185a06e
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/connectivity/Vpn.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ public class Vpn extends INetworkManagementEventObserver.Stub { 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; |