commit bc1c1bc38eb63514548af5580867d486d275675c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 22 03:23:48 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 22 03:23:48 2021 +0000
tree 9a80cbcc0a1e7d3810a72430f784e5d6d8b8ef63
parent 5cf377d2a3345299c7497cce374385d875c23f4d
parent 22cb7841a559884f52e61d885194e4d98ee70053

Merge "Move trimV4AddrZeros to libs/net" am: 22cb7841a5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636022

Change-Id: Ifbad5630a39f8990479a5f20e018a3a499334fe1

framework/src/android/net/NetworkUtils.java

diff --git a/framework/src/android/net/NetworkUtils.java b/framework/src/android/net/NetworkUtils.java
index c0f2628..c4bebc0 100644
--- a/framework/src/android/net/NetworkUtils.java
+++ b/framework/src/android/net/NetworkUtils.java
@@ -323,22 +323,7 @@
      */
     @UnsupportedAppUsage
     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);
-        String result = null;
-        for (int i = 0; i < 4; i++) {
-            try {
-                if (octets[i].length() > 3) return addr;
-                builder.append(Integer.parseInt(octets[i]));
-            } catch (NumberFormatException e) {
-                return addr;
-            }
-            if (i < 3) builder.append('.');
-        }
-        result = builder.toString();
-        return result;
+        return Inet4AddressUtils.trimAddressZeros(addr);
     }
 
     /**