diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index bcb68ffd086..2099d85b8e3 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -60,6 +60,7 @@ import android.hardware.fingerprint.FingerprintManager; import android.media.MediaRoute2Info; import android.media.MediaRouter2Manager; import android.net.ConnectivityManager; +import android.net.LinkAddress; import android.net.LinkProperties; import android.net.Network; import android.net.wifi.WifiManager; @@ -116,7 +117,6 @@ import com.android.settings.dashboard.profileselector.ProfileSelectFragment; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.widget.ActionBarShadowController; -import java.net.InetAddress; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -237,13 +237,13 @@ public final class Utils extends com.android.settingslib.Utils { private static String formatIpAddresses(LinkProperties prop) { if (prop == null) return null; - final Iterator iter = prop.getAllAddresses().iterator(); + final Iterator iter = prop.getAllLinkAddresses().iterator(); // If there are no entries, return null if (!iter.hasNext()) return null; // Concatenate all available addresses, comma separated String addresses = ""; while (iter.hasNext()) { - addresses += iter.next().getHostAddress(); + addresses += iter.next().getAddress().getHostAddress(); if (iter.hasNext()) addresses += "\n"; } return addresses; diff --git a/src/com/android/settings/development/AdbIpAddressPreferenceController.java b/src/com/android/settings/development/AdbIpAddressPreferenceController.java index 45fe51b145a..ce5a8513d38 100644 --- a/src/com/android/settings/development/AdbIpAddressPreferenceController.java +++ b/src/com/android/settings/development/AdbIpAddressPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.development; import android.content.Context; import android.debug.IAdbManager; import android.net.ConnectivityManager; +import android.net.LinkAddress; import android.net.LinkProperties; import android.net.wifi.WifiManager; import android.os.RemoteException; @@ -135,7 +136,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer return null; } - Iterator iter = prop.getAllAddresses().iterator(); + Iterator iter = prop.getAllLinkAddresses().iterator(); // If there are no entries, return null if (!iter.hasNext()) { return null; @@ -144,7 +145,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer // Concatenate all available addresses, newline separated StringBuilder addresses = new StringBuilder(); while (iter.hasNext()) { - InetAddress addr = iter.next(); + InetAddress addr = iter.next().getAddress(); if (addr instanceof Inet4Address) { // adb only supports ipv4 at the moment addresses.append(addr.getHostAddress()); diff --git a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java index 2f55b3f5f57..8bd302817b3 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java @@ -40,11 +40,13 @@ public class AirplaneModeConditionController implements ConditionalCardControlle private final ConditionManager mConditionManager; private final Context mAppContext; private final Receiver mReceiver; + private final ConnectivityManager mConnectivityManager; public AirplaneModeConditionController(Context appContext, ConditionManager conditionManager) { mAppContext = appContext; mConditionManager = conditionManager; mReceiver = new Receiver(); + mConnectivityManager = mAppContext.getSystemService(ConnectivityManager.class); } @Override @@ -65,7 +67,7 @@ public class AirplaneModeConditionController implements ConditionalCardControlle @Override public void onActionClick() { - ConnectivityManager.from(mAppContext).setAirplaneMode(false); + mConnectivityManager.setAirplaneMode(false); } @Override diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index f6fda6def71..566833cec6d 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -825,9 +825,12 @@ public class WifiConfigController implements TextWatcher, .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId(); } - config.setIpConfiguration( - new IpConfiguration(mIpAssignment, mProxySettings, - mStaticIpConfiguration, mHttpProxy)); + final IpConfiguration ipConfig = new IpConfiguration(); + ipConfig.setIpAssignment(mIpAssignment); + ipConfig.setProxySettings(mProxySettings); + ipConfig.setStaticIpConfiguration(mStaticIpConfiguration); + ipConfig.setHttpProxy(mHttpProxy); + config.setIpConfiguration(ipConfig); if (mMeteredSettingsSpinner != null) { config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition(); } @@ -1400,18 +1403,18 @@ public class WifiConfigController implements TextWatcher, StaticIpConfiguration staticConfig = config.getIpConfiguration() .getStaticIpConfiguration(); if (staticConfig != null) { - if (staticConfig.ipAddress != null) { + if (staticConfig.getIpAddress() != null) { mIpAddressView.setText( - staticConfig.ipAddress.getAddress().getHostAddress()); - mNetworkPrefixLengthView.setText(Integer.toString(staticConfig.ipAddress - .getPrefixLength())); + staticConfig.getIpAddress().getAddress().getHostAddress()); + mNetworkPrefixLengthView.setText(Integer.toString( + staticConfig.getIpAddress().getPrefixLength())); } - if (staticConfig.gateway != null) { - mGatewayView.setText(staticConfig.gateway.getHostAddress()); + if (staticConfig.getGateway() != null) { + mGatewayView.setText(staticConfig.getGateway().getHostAddress()); } - Iterator dnsIterator = staticConfig.dnsServers.iterator(); + Iterator dnsIterator = staticConfig.getDnsServers().iterator(); if (dnsIterator.hasNext()) { mDns1View.setText(dnsIterator.next().getHostAddress()); } diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java index 06fbc88d6a4..e6b153ed83e 100644 --- a/src/com/android/settings/wifi/WifiConfigController2.java +++ b/src/com/android/settings/wifi/WifiConfigController2.java @@ -807,9 +807,12 @@ public class WifiConfigController2 implements TextWatcher, return null; } - config.setIpConfiguration( - new IpConfiguration(mIpAssignment, mProxySettings, - mStaticIpConfiguration, mHttpProxy)); + final IpConfiguration ipConfig = new IpConfiguration(); + ipConfig.setIpAssignment(mIpAssignment); + ipConfig.setProxySettings(mProxySettings); + ipConfig.setStaticIpConfiguration(mStaticIpConfiguration); + ipConfig.setHttpProxy(mHttpProxy); + config.setIpConfiguration(ipConfig); if (mMeteredSettingsSpinner != null) { config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition(); } @@ -958,7 +961,7 @@ public class WifiConfigController2 implements TextWatcher, return R.string.wifi_ip_settings_invalid_dns; } dnsServers.add(dnsAddr); - staticIpConfiguration.dnsServers.add(dnsAddr); + staticIpConfiguration.getDnsServers().add(dnsAddr); } if (mDns2View.length() > 0) { @@ -968,7 +971,7 @@ public class WifiConfigController2 implements TextWatcher, return R.string.wifi_ip_settings_invalid_dns; } dnsServers.add(dnsAddr); - staticIpConfiguration.dnsServers.add(dnsAddr); + staticIpConfiguration.getDnsServers().add(dnsAddr); } staticIPBuilder.setDnsServers(dnsServers); return 0; @@ -1393,7 +1396,7 @@ public class WifiConfigController2 implements TextWatcher, staticConfig.getIpAddress().getPrefixLength())); } - if (staticConfig.gateway != null) { + if (staticConfig.getGateway() != null) { mGatewayView.setText(staticConfig.getGateway().getHostAddress()); } diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index b30360cf4a3..b4d42909fbb 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -901,7 +901,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController // Find IPv4 default gateway. String gateway = null; for (RouteInfo routeInfo : mLinkProperties.getRoutes()) { - if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) { + if (routeInfo.hasGateway() && routeInfo.isDefaultRoute() + && routeInfo.getDestination().getAddress() instanceof Inet4Address) { gateway = routeInfo.getGateway().getHostAddress(); break; } diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java index e432b07e81e..3f8ab18cfc7 100644 --- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java @@ -838,7 +838,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle // Find IPv4 default gateway. String gateway = null; for (RouteInfo routeInfo : mLinkProperties.getRoutes()) { - if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) { + if (routeInfo.hasGateway() && routeInfo.isDefaultRoute() + && routeInfo.getDestination().getAddress() instanceof Inet4Address) { gateway = routeInfo.getGateway().getHostAddress(); break; }