Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa71962f authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android Git Automerger
Browse files

am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 

* commit '46a4e81d':
  VPN: delete the "abort" file before starting VPN daemons.
parents c34306e4 46a4e81d

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

+1 −0
Original line number Diff line number Diff line
@@ -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;