commit fbb09ea84f7a9df94358f05f4e680cb363bae663
author Robert Greenwalt <rgreenwalt@google.com> Wed Dec 07 17:09:05 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 07 17:09:05 2011 -0800
tree 9d87ecb453169c4ff09f2303a4b72fed29116b24
parent 3b5555fc4483f6813f3df4787d98dd5357851566
parent 0faacf0658af00929481fa158f0c88289ba5145f

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

core/java/android/net/NetworkUtils.java

diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 5f573bb..d39e741e 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);