am 4a4edbb: am 7fecf5f: Merge "Make addAddress locale safe"

Jean-Baptiste Queru · Android Git Automerger · commit 69626dab17f9 · 2012-08-29T13:03:41.000-07:00
* commit '4a4edbbfce2e1a8b34b5b9ff2793eace303dae5a':
  Make addAddress locale safe
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java
@@ -329,7 +329,7 @@ public Builder addAddress(InetAddress address, int prefixLength) {
                 throw new IllegalArgumentException("Bad address");
             }
 
-            mAddresses.append(String.format(" %s/%d", address.getHostAddress(), prefixLength));
+            mAddresses.append(' ' + address.getHostAddress() + '/' +  prefixLength);
             return this;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ public Builder addAddress(InetAddress address, int prefixLength) {`
`329`	`329`	`throw new IllegalArgumentException("Bad address");`
`330`	`330`	`}`
`331`	`331`
`332`		`- mAddresses.append(String.format(" %s/%d", address.getHostAddress(), prefixLength));`
	`332`	`+ mAddresses.append(' ' + address.getHostAddress() + '/' + prefixLength);`
`333`	`333`	`return this;`
`334`	`334`	`}`
`335`	`335`