From 438406092ed71c658bf5a4e6ae2e7282fc4fab4d Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 20 Aug 2014 16:01:44 -0700 Subject: [PATCH] Update state to failed if the VPN fails to connect. Without this, the VPN settings dialog stays in "Connecting..." forever. Bug: 17140195 Change-Id: I4771be464384b62114839523fb2a6b36aa6520ee --- services/core/java/com/android/server/connectivity/Vpn.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 0f6b3adc609b2..f19f2f5f93c9b 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1263,6 +1263,7 @@ public class Vpn { } } catch (Exception e) { Log.i(TAG, "Aborting", e); + updateState(DetailedState.FAILED, e.getMessage()); exit(); } finally { // Kill the daemons if they fail to stop.