diff options
author | Takuo Kitame <kitame@gmail.com> | 2010-07-01 14:16:17 +0900 |
---|---|---|
committer | ctso <ctsoyars@gmail.com> | 2010-07-02 17:25:46 +0000 |
commit | d5e1990d2ff5ca597afa32159e4bd52de2dfc13b (patch) | |
tree | d3bf6b21009560077f56035315828c4e31a0b9f9 /packages | |
parent | d2826af8f8c1ed108d56fef4fe5690f8d04b4bbf (diff) | |
download | frameworks_base-d5e1990d2ff5ca597afa32159e4bd52de2dfc13b.zip frameworks_base-d5e1990d2ff5ca597afa32159e4bd52de2dfc13b.tar.gz frameworks_base-d5e1990d2ff5ca597afa32159e4bd52de2dfc13b.tar.bz2 |
Fix merge fail
Diffstat (limited to 'packages')
-rw-r--r-- | packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java index c0df60c..1a5008f 100644 --- a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java +++ b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java @@ -66,9 +66,13 @@ class OpenvpnService extends VpnService<OpenvpnProfile> { args.add("--proto"); args.add(p.getProto()); args.add("--client"); args.add("--rport"); args.add(p.getPort()); - args.add("--ca"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.CA_CERTIFICATE + p.getCAName()); - args.add("--cert"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.USER_CERTIFICATE + p.getCertName()); - args.add("--key"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.USER_PRIVATE_KEY + p.getCertName()); + if (p.getCAName() != null) { + args.add("--ca"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.CA_CERTIFICATE + p.getCAName()); + } + if (p.getCertName() != null) { + args.add("--cert"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.USER_CERTIFICATE + p.getCertName()); + args.add("--key"); args.add(USE_INLINE); args.add(USE_KEYSTORE + Credentials.USER_PRIVATE_KEY + p.getCertName()); + } args.add("--persist-tun"); args.add("--persist-key"); args.add("--management"); args.add("/dev/socket/" + socketName); args.add("unix"); |