commit 438406092ed71c658bf5a4e6ae2e7282fc4fab4d
author Lorenzo Colitti <lorenzo@google.com> Wed Aug 20 16:01:44 2014 -0700
committer Lorenzo Colitti <lorenzo@google.com> Wed Aug 20 16:01:44 2014 -0700
tree 962c08dc64d0419ea3fbaa660a0cb8702dc8bd33
parent da3475dba70965908bbef269a004a71433963532

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 0f6b3ad..f19f2f5 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 @@
                 }
             } catch (Exception e) {
                 Log.i(TAG, "Aborting", e);
+                updateState(DetailedState.FAILED, e.getMessage());
                 exit();
             } finally {
                 // Kill the daemons if they fail to stop.