LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

Browse Source 
* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
  Fix NPE in trimV4AddrZeros.
This commit is contained in:
Robert Greenwalt
2011-12-07 17:12:47 -08:00
committed by Android Git Automerger
parent 177cac90d0 549920a597
commit 60660ab0f4
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/net/NetworkUtils.java
View File

@@ -261,6 +261,7 @@ public class NetworkUtils {
* @return a string propertly trimmed * @return a string propertly trimmed
*/ */
public static String trimV4AddrZeros(String addr) { public static String trimV4AddrZeros(String addr) {
if (addr == null) return null;
String[] octets = addr.split("\\."); String[] octets = addr.split("\\.");
if (octets.length != 4) return addr; if (octets.length != 4) return addr;
StringBuilder builder = new StringBuilder(16); StringBuilder builder = new StringBuilder(16);