diff options
| author | 2011-12-07 17:09:05 -0800 | |
|---|---|---|
| committer | 2011-12-07 17:09:05 -0800 | |
| commit | fbb09ea84f7a9df94358f05f4e680cb363bae663 (patch) | |
| tree | 9d87ecb453169c4ff09f2303a4b72fed29116b24 | |
| parent | 3b5555fc4483f6813f3df4787d98dd5357851566 (diff) | |
| parent | 0faacf0658af00929481fa158f0c88289ba5145f (diff) | |
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
| -rw-r--r-- | core/java/android/net/NetworkUtils.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 5f573bb5558d..d39e741efddc 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -261,6 +261,7 @@ public class NetworkUtils { * @return a string propertly trimmed */ public static String trimV4AddrZeros(String addr) { + if (addr == null) return null; String[] octets = addr.split("\\."); if (octets.length != 4) return addr; StringBuilder builder = new StringBuilder(16); |