Merge "Start using NetworkUtils.numericToInetAddress." am: 95c300a353

Original change: undetermined Change-Id: I778e761d7ec016968b1da3efeb1990379f00c26a
2021-05-31 11:05:42 +00:00
parent 724cb546af 95c300a353
commit 864130aa3e
1 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -286,8 +286,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                    com.android.internal.R.string.config_default_dns_server);
        }
        try {
-            mDefaultDns = InetAddress.getByName(dns);
-        } catch (UnknownHostException e) {
+            mDefaultDns = NetworkUtils.numericToInetAddress(dns);
+        } catch (IllegalArgumentException e) {
            loge("Error setting defaultDns using " + dns);
        }