Replace the hidden API with the public API am: dc9b6d218a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/1696947

Change-Id: Ifc214d10d1ff7ddacffd00724c63df5930605d63

4 files changed, 26 insertions, 18 deletions

diff --git a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
index 8956cef2a..d5f6aa05a 100644
--- a/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
+++ b/Settings/src/com/android/tv/settings/connectivity/ConnectivityListener.java
@@ -21,6 +21,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.EthernetManager;
 import android.net.LinkAddress;
@@ -281,7 +282,7 @@ public class ConnectivityListener implements WifiTracker.WifiListener, Lifecycle
      * Return whether Ethernet port is available.
      */
     public boolean isEthernetAvailable() {
-        return mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET)
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_ETHERNET)
                 && mEthernetManager.getAvailableInterfaces().length > 0;
     }
 
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java
index 313302b77..9d01c58ba 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/AdvancedOptionsFlowInfo.java
@@ -167,9 +167,9 @@ public class AdvancedOptionsFlowInfo extends ViewModel {
      */
     public InetAddress getInitialDns(int index) {
         if (mIpConfiguration != null && mIpConfiguration.getStaticIpConfiguration() != null
-                && mIpConfiguration.getStaticIpConfiguration().dnsServers == null) {
+                && mIpConfiguration.getStaticIpConfiguration().getDnsServers() != null) {
             try {
-                return mIpConfiguration.getStaticIpConfiguration().dnsServers.get(index);
+                return mIpConfiguration.getStaticIpConfiguration().getDnsServers().get(index);
             } catch (IndexOutOfBoundsException e) {
                 return null;
             }
@@ -182,7 +182,7 @@ public class AdvancedOptionsFlowInfo extends ViewModel {
      */
     public InetAddress getInitialGateway() {
         if (mIpConfiguration != null && mIpConfiguration.getStaticIpConfiguration() != null) {
-            return mIpConfiguration.getStaticIpConfiguration().gateway;
+            return mIpConfiguration.getStaticIpConfiguration().getGateway();
         } else {
             return null;
         }
@@ -193,7 +193,7 @@ public class AdvancedOptionsFlowInfo extends ViewModel {
      */
     public LinkAddress getInitialLinkAddress() {
         if (mIpConfiguration != null && mIpConfiguration.getStaticIpConfiguration() != null) {
-            return mIpConfiguration.getStaticIpConfiguration().ipAddress;
+            return mIpConfiguration.getStaticIpConfiguration().getIpAddress();
         } else {
             return null;
         }
diff --git a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java
index 5261d5f76..3940947ca 100644
--- a/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java
+++ b/Settings/src/com/android/tv/settings/connectivity/setup/ProxyBypassState.java
@@ -27,6 +27,7 @@ import androidx.leanback.widget.GuidedAction;
 import androidx.leanback.widget.GuidedActionsStylist;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.android.net.module.util.ProxyUtils;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.util.AdvancedOptionsFlowUtil;
 import com.android.tv.settings.connectivity.util.State;
@@ -112,7 +113,8 @@ public class ProxyBypassState implements State {
             if (mAdvancedOptionsFlowInfo.containsPage(AdvancedOptionsFlowInfo.PROXY_BYPASS)) {
                 title = mAdvancedOptionsFlowInfo.get(AdvancedOptionsFlowInfo.PROXY_BYPASS);
             }  else if (mAdvancedOptionsFlowInfo.getInitialProxyInfo() != null) {
-                title = mAdvancedOptionsFlowInfo.getInitialProxyInfo().getExclusionListAsString();
+                title = ProxyUtils.exclusionListAsString(
+                        mAdvancedOptionsFlowInfo.getInitialProxyInfo().getExclusionList());
             }
 
             Context context = getActivity();
diff --git a/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java b/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java
index 1b60c6e5a..4579dc190 100644
--- a/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java
+++ b/Settings/src/com/android/tv/settings/connectivity/util/AdvancedOptionsFlowUtil.java
@@ -16,9 +16,9 @@
 
 package com.android.tv.settings.connectivity.util;
 
+import android.net.InetAddresses;
 import android.net.IpConfiguration;
 import android.net.LinkAddress;
-import android.net.NetworkUtils;
 import android.net.ProxyInfo;
 import android.net.StaticIpConfiguration;
 import android.text.TextUtils;
@@ -26,11 +26,14 @@ import android.text.TextUtils;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProviders;
 
+import com.android.net.module.util.ProxyUtils;
 import com.android.tv.settings.R;
 import com.android.tv.settings.connectivity.WifiConfigHelper;
 import com.android.tv.settings.connectivity.setup.AdvancedOptionsFlowInfo;
 
 import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.util.ArrayList;
 
 /**
  * Class that helps process proxy and IP settings.
@@ -70,7 +73,8 @@ public class AdvancedOptionsFlowUtil {
                 result = R.string.proxy_error_invalid_port;
             }
             if (result == 0) {
-                mIpConfiguration.setHttpProxy(new ProxyInfo(host, port, exclusionList));
+                mIpConfiguration.setHttpProxy(ProxyInfo.buildDirectProxy(host, port,
+                        ProxyUtils.exclusionStringAsList(exclusionList)));
             } else {
                 return result;
             }
@@ -102,15 +106,15 @@ public class AdvancedOptionsFlowUtil {
                         ? IpConfiguration.IpAssignment.STATIC
                         : IpConfiguration.IpAssignment.DHCP);
         if (hasIpSettings) {
-            StaticIpConfiguration staticConfig = new StaticIpConfiguration();
-            mIpConfiguration.setStaticIpConfiguration(staticConfig);
+            final StaticIpConfiguration.Builder staticIpBuilder =
+                    new StaticIpConfiguration.Builder();
             String ipAddr = flowInfo.get(AdvancedOptionsFlowInfo.IP_ADDRESS);
             if (TextUtils.isEmpty(ipAddr)) {
                 return R.string.wifi_ip_settings_invalid_ip_address;
             }
             Inet4Address inetAddr;
             try {
-                inetAddr = (Inet4Address) NetworkUtils.numericToInetAddress(ipAddr);
+                inetAddr = (Inet4Address) InetAddresses.parseNumericAddress(ipAddr);
             } catch (IllegalArgumentException | ClassCastException e) {
                 return R.string.wifi_ip_settings_invalid_ip_address;
             }
@@ -121,7 +125,7 @@ public class AdvancedOptionsFlowUtil {
                 if (networkPrefixLength < 0 || networkPrefixLength > 32) {
                     return R.string.wifi_ip_settings_invalid_network_prefix_length;
                 }
-                staticConfig.ipAddress = new LinkAddress(inetAddr, networkPrefixLength);
+                staticIpBuilder.setIpAddress(new LinkAddress(inetAddr, networkPrefixLength));
             } catch (NumberFormatException e) {
                 return R.string.wifi_ip_settings_invalid_ip_address;
             }
@@ -129,18 +133,17 @@ public class AdvancedOptionsFlowUtil {
             String gateway = flowInfo.get(AdvancedOptionsFlowInfo.GATEWAY);
             if (!TextUtils.isEmpty(gateway)) {
                 try {
-                    staticConfig.gateway =
-                            NetworkUtils.numericToInetAddress(gateway);
+                    staticIpBuilder.setGateway(InetAddresses.parseNumericAddress(gateway));
                 } catch (IllegalArgumentException | ClassCastException e) {
                     return R.string.wifi_ip_settings_invalid_gateway;
                 }
             }
 
+            final ArrayList<InetAddress> dnsServers = new ArrayList<>();
             String dns1 = flowInfo.get(AdvancedOptionsFlowInfo.DNS1);
             if (!TextUtils.isEmpty(dns1)) {
                 try {
-                    staticConfig.dnsServers.add(
-                            NetworkUtils.numericToInetAddress(dns1));
+                    dnsServers.add(InetAddresses.parseNumericAddress(dns1));
                 } catch (IllegalArgumentException | ClassCastException e) {
                     return R.string.wifi_ip_settings_invalid_dns;
                 }
@@ -149,12 +152,14 @@ public class AdvancedOptionsFlowUtil {
             String dns2 = flowInfo.get(AdvancedOptionsFlowInfo.DNS2);
             if (!TextUtils.isEmpty(dns2)) {
                 try {
-                    staticConfig.dnsServers.add(
-                            NetworkUtils.numericToInetAddress(dns2));
+                    dnsServers.add(InetAddresses.parseNumericAddress(dns2));
                 } catch (IllegalArgumentException | ClassCastException e) {
                     return R.string.wifi_ip_settings_invalid_dns;
                 }
             }
+
+            staticIpBuilder.setDnsServers(dnsServers);
+            mIpConfiguration.setStaticIpConfiguration(staticIpBuilder.build());
         } else {
             mIpConfiguration.setStaticIpConfiguration(null);
         }