drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

Browse Source
This commit is contained in:
Robert Greenwalt
2011-12-07 17:09:05 -08:00
committed by Android (Google) Code Review
parent 3b5555fc44 0faacf0658
commit fbb09ea84f
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);