am 69626dab: am 4a4edbbf: am 7fecf5f4: Merge "Make addAddress locale safe"

* commit '69626dab17f9e059cfa2e8c3ce4ec9aaa5f9853e': Make addAddress locale safe
2012-08-29 13:06:08 -07:00
parent 8897b4f530 69626dab17
commit 959c05a122
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/net/VpnService.java
+++ b/core/java/android/net/VpnService.java
@@ -329,7 +329,7 @@ public class VpnService extends Service {
                throw new IllegalArgumentException("Bad address");
            }

-            mAddresses.append(String.format(" %s/%d", address.getHostAddress(), prefixLength));
+            mAddresses.append(' ' + address.getHostAddress() + '/' +  prefixLength);
            return this;
        }