summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs/src
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-07-02 01:48:50 -0700
committerChia-chi Yeh <chiachi@android.com>2011-07-02 01:48:50 -0700
commite9107901ae264de4ff5603d3cfc63a03ca4117d4 (patch)
tree10af89085b6b96e67f3e2861d02436d1dda04db5 /packages/VpnDialogs/src
parentdfba1773c911c4d97838923334c5a879424387bf (diff)
downloadframeworks_base-e9107901ae264de4ff5603d3cfc63a03ca4117d4.zip
frameworks_base-e9107901ae264de4ff5603d3cfc63a03ca4117d4.tar.gz
frameworks_base-e9107901ae264de4ff5603d3cfc63a03ca4117d4.tar.bz2
VPN: give legacy VPN a fake package name.
And add more comments. Change-Id: I0cbc495fcb2c8dd105e16a841619b3b9bd227eae
Diffstat (limited to 'packages/VpnDialogs/src')
-rw-r--r--packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
index c076ba0..206ce23 100644
--- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
+++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
@@ -72,8 +72,7 @@ public class ManageDialog extends Activity implements Handler.Callback,
mDataTransmitted = (TextView) view.findViewById(R.id.data_transmitted);
mDataReceived = (TextView) view.findViewById(R.id.data_received);
- if (mConfig.packageName == null) {
- // Legacy VPN does not have a package name.
+ if (mConfig.packageName.equals(VpnConfig.LEGACY_VPN)) {
mDialog = new AlertDialog.Builder(this)
.setIcon(android.R.drawable.ic_dialog_info)
.setTitle(R.string.legacy_title)
@@ -126,7 +125,7 @@ public class ManageDialog extends Activity implements Handler.Callback,
if (which == AlertDialog.BUTTON_POSITIVE) {
mConfig.configureIntent.send();
} else if (which == AlertDialog.BUTTON_NEUTRAL) {
- mService.prepareVpn("");
+ mService.prepareVpn(VpnConfig.LEGACY_VPN);
}
} catch (Exception e) {
Log.e(TAG, "onClick", e);