Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4741163c authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

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

* commit 'fbb09ea8':
  Fix NPE in trimV4AddrZeros.
parents 675a5ba8 fbb09ea8

core/java/android/net/NetworkUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -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);