commit 60660ab0f4c3e8aaa2a01d87f0f8a9a0e1b78e16
author Robert Greenwalt <rgreenwalt@google.com> Wed Dec 07 17:12:47 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 07 17:12:47 2011 -0800
tree 4494a5893e8faec1364071715c7a89ecac5c2268
parent 177cac90d049d55d43ea68aa52fb1de48b71dad4
parent 549920a597b444ca6e88f3f1e0b7504168bc0499

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

* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
  Fix NPE in trimV4AddrZeros.

core/java/android/net/NetworkUtils.java

diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 5f573bb..d39e741 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -261,6 +261,7 @@
      * @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);