summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-09-02 12:33:33 +0000
committerGerrit Code Review <gerrit2@cyanogenmod.teamdouche.net>2010-09-02 12:33:33 +0000
commitf401c65a467799c36a2934d439a76a8b5b29c8a4 (patch)
tree4de6454abf10d7cd8e17104d914d32ec734f17b5
parent7aa3eb089ec1b6d07624ec87e0f1153b4435088e (diff)
parentc950bd3f05e58aec82dfcf1963f72810664331c8 (diff)
downloadframeworks_base-f401c65a467799c36a2934d439a76a8b5b29c8a4.zip
frameworks_base-f401c65a467799c36a2934d439a76a8b5b29c8a4.tar.gz
frameworks_base-f401c65a467799c36a2934d439a76a8b5b29c8a4.tar.bz2
Merge "use local variable p" into froyo
-rw-r--r--packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
index 487e51b..9c19391 100644
--- a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
@@ -68,7 +68,7 @@ class OpenvpnService extends VpnService<OpenvpnProfile> {
args.add("tun");
}
args.add("--remote");
- args.add(getProfile().getServerName());
+ args.add(p.getServerName());
args.add("--nobind");
args.add("--proto");
args.add(p.getProto());