diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-08-03 15:39:59 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2011-08-03 15:52:12 -0700 |
| commit | fcc1b41b663c1a0cb551344c4a16a5ad9ce36d60 (patch) | |
| tree | 348f18a4ff0f2c2dccb84b3ea486aed0764d49ab /packages/VpnDialogs | |
| parent | e5750a344a9c1a83a63d5119d39d2ea4897bc312 (diff) | |
| download | frameworks_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')
| -rw-r--r-- | packages/VpnDialogs/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index bd5f739..8e062b7 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -5,7 +5,6 @@ <application android:label="VpnDialogs" android:allowBackup="false" > <activity android:name=".ConfirmDialog" - android:permission="android.permission.VPN" android:theme="@style/transparent"> <intent-filter> <action android:name="android.intent.action.MAIN"/> 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); |