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

Commit b2bb1973 authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Restore legacy VPN stats dialog. 

Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
parent 2534be37

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

+9 −0
Original line number Diff line number Diff line
@@ -350,6 +350,15 @@ public class VpnSettings extends SettingsPreferenceFragment implements 


        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.