diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-04 15:24:58 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-08-23 16:41:06 -0700 |
| commit | 899223b97c9b0ae56a8211a46600914c0ecfd854 (patch) | |
| tree | 19b98a147be6309366dc1652f17e9fe3fe6f6e63 /packages/VpnDialogs/src/com/android | |
| parent | 2c1dfa29b40a988e3ea8f6922768465743aafddc (diff) | |
| download | frameworks_base-899223b97c9b0ae56a8211a46600914c0ecfd854.zip frameworks_base-899223b97c9b0ae56a8211a46600914c0ecfd854.tar.gz frameworks_base-899223b97c9b0ae56a8211a46600914c0ecfd854.tar.bz2 | |
Begin moving VPN to NetworkStateTracker pattern.
Created base tracker that handles common bookkeeping, and move VPN
to become a tracker. VPN status is now reflected in NetworkInfo, and
is mapped to LegacyVpnInfo.
Legacy VPN now "babysits" any init services it starts, watching for
when they stop unexpectedly.
Bug: 5756357
Change-Id: Iba7ec79da69469f6bd9a970cc39cf6b885b4c9c4
Diffstat (limited to 'packages/VpnDialogs/src/com/android')
| -rw-r--r-- | packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java index 9999adb..ff9bbc5 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java @@ -79,7 +79,7 @@ public class ManageDialog extends AlertActivity implements mDataReceived = (TextView) view.findViewById(R.id.data_received); mDataRowsHidden = true; - if (mConfig.user.equals(VpnConfig.LEGACY_VPN)) { + if (mConfig.legacy) { mAlertParams.mIconId = android.R.drawable.ic_dialog_info; mAlertParams.mTitle = getText(R.string.legacy_title); } else { |