commit 8e6edba5606fd717a631aabcc4c5702bdd509033
author Jeff Davidson <jpd@google.com> Sat Aug 23 00:55:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 23 00:55:40 2014 +0000
tree 5b6565c1259ba51c0f6cc4fa8a037dda14509781
parent 1351b0fbcddea9cc66941e8af1de148142b92201
parent b2bb1973fe32f2a52cb27155e525798c6a4eca6d

Merge "Restore legacy VPN stats dialog." into lmp-dev

src/com/android/settings/vpn2/VpnSettings.java

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index ab84654..7516392 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -350,6 +350,15 @@
 
         if (preference instanceof VpnPreference) {
             VpnProfile profile = ((VpnPreference) preference).getProfile();
+            if (mInfo != null && profile.key.equals(mInfo.key) &&
+                    mInfo.state == LegacyVpnInfo.STATE_CONNECTED) {
+                try {
+                    mInfo.intent.send();
+                    return true;
+                } catch (Exception e) {
+                    // ignore
+                }
+            }
             mDialog = new VpnDialog(getActivity(), this, profile, false);
         } else {
             // Generate a new key. Here we just use the current time.