From 3cd42dfd50adf8d78a9d4984957a96dec2ba13f4 Mon Sep 17 00:00:00 2001 From: Johan Redestig Date: Tue, 28 Aug 2012 09:28:50 +0200 Subject: [PATCH] Make addAddress locale safe Using regular string concatenation to avoid unexpected results in some locales. Change-Id: I47dd5e174c4a2e88dc18e014002820cdbf63fcad --- core/java/android/net/VpnService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index fb5263d9f13d5..65d3f2b27673f 100644 --- 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; }