From 549920a597b444ca6e88f3f1e0b7504168bc0499 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Wed, 7 Dec 2011 16:43:59 -0800
Subject: [PATCH] Fix NPE in trimV4AddrZeros.

Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
---
 core/java/android/net/NetworkUtils.java | 1 +
 1 file changed, 1 insertion(+)

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