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

* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a': Make addAddress locale safe
2012-08-29 13:03:41 -07:00
parent c134885e6f 4a4edbbfce
commit 69626dab17
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;
        }