summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs/src/com/android
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2011-08-03 15:39:59 -0700
committerChia-chi Yeh <chiachi@android.com>2011-08-03 15:52:12 -0700
commitfcc1b41b663c1a0cb551344c4a16a5ad9ce36d60 (patch)
tree348f18a4ff0f2c2dccb84b3ea486aed0764d49ab /packages/VpnDialogs/src/com/android
parente5750a344a9c1a83a63d5119d39d2ea4897bc312 (diff)
downloadframeworks_base-fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60.zip
frameworks_base-fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60.tar.gz
frameworks_base-fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60.tar.bz2
VPN: move away from the VPN permission.
VpnBuilder will be replaced by VpnService in the next change. Change-Id: I2dea67a1616b74d17b372f7b214d207f1617198e
Diffstat (limited to 'packages/VpnDialogs/src/com/android')
-rw-r--r--packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
index 40c0a02..d668e98 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 Activity implements Handler.Callback,
mDataTransmitted = (TextView) view.findViewById(R.id.data_transmitted);
mDataReceived = (TextView) view.findViewById(R.id.data_received);
- if (mConfig.packagz.equals(VpnConfig.LEGACY_VPN)) {
+ if (mConfig.user.equals(VpnConfig.LEGACY_VPN)) {
mDialog = new AlertDialog.Builder(this)
.setIcon(android.R.drawable.ic_dialog_info)
.setTitle(R.string.legacy_title)
@@ -89,7 +89,7 @@ public class ManageDialog extends Activity implements Handler.Callback,
.create();
} else {
PackageManager pm = getPackageManager();
- ApplicationInfo app = pm.getApplicationInfo(mConfig.packagz, 0);
+ ApplicationInfo app = pm.getApplicationInfo(mConfig.user, 0);
mDialog = new AlertDialog.Builder(this)
.setIcon(app.loadIcon(pm))
.setTitle(app.loadLabel(pm))
@@ -131,7 +131,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(mConfig.packagz, VpnConfig.LEGACY_VPN);
+ mService.prepareVpn(mConfig.user, VpnConfig.LEGACY_VPN);
}
} catch (Exception e) {
Log.e(TAG, "onClick", e);