commit | 7fecf5f4513a94adb71ba29b9918565b4b5e5e7b | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 29 12:19:03 2012 -0700 |
committer | android code review <noreply-gerritcodereview@google.com> | Wed Aug 29 12:19:04 2012 -0700 |
tree | 52b9ddaa22a8796c79f72266b1ea72b4aa95f098 | |
parent | 4ba4caede125ff602b0d93f577f9054a07791ff7 [diff] | |
parent | 3cd42dfd50adf8d78a9d4984957a96dec2ba13f4 [diff] |
Merge "Make addAddress locale safe"
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index fb5263d..65d3f2b 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java
@@ -329,7 +329,7 @@ throw new IllegalArgumentException("Bad address"); } - mAddresses.append(String.format(" %s/%d", address.getHostAddress(), prefixLength)); + mAddresses.append(' ' + address.getHostAddress() + '/' + prefixLength); return this; }