Remove hidden connectivity methods access
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.
Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 4bf97cc..391ee90 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -54,6 +54,7 @@
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.net.ConnectivityManager;
+import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.Network;
import android.net.wifi.WifiManager;
@@ -111,7 +112,6 @@
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;
@@ -246,13 +246,13 @@
private static String formatIpAddresses(LinkProperties prop) {
if (prop == null) return null;
- final Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
+ final Iterator<LinkAddress> 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 45fe51b..ce5a851 100644
--- a/src/com/android/settings/development/AdbIpAddressPreferenceController.java
+++ b/src/com/android/settings/development/AdbIpAddressPreferenceController.java
@@ -19,6 +19,7 @@
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 @@
return null;
}
- Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
+ Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();
// If there are no entries, return null
if (!iter.hasNext()) {
return null;
@@ -144,7 +145,7 @@
// 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 2f55b3f..8bd3028 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 @@
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 @@
@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 db355f4..408ffbe 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -812,9 +812,12 @@
.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();
}
@@ -1382,18 +1385,18 @@
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<InetAddress> dnsIterator = staticConfig.dnsServers.iterator();
+ Iterator<InetAddress> 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 5cc0499..9f3b1a7 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -775,9 +775,12 @@
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();
}
@@ -920,7 +923,7 @@
return R.string.wifi_ip_settings_invalid_dns;
}
dnsServers.add(dnsAddr);
- staticIpConfiguration.dnsServers.add(dnsAddr);
+ staticIpConfiguration.getDnsServers().add(dnsAddr);
}
if (mDns2View.length() > 0) {
@@ -930,7 +933,7 @@
return R.string.wifi_ip_settings_invalid_dns;
}
dnsServers.add(dnsAddr);
- staticIpConfiguration.dnsServers.add(dnsAddr);
+ staticIpConfiguration.getDnsServers().add(dnsAddr);
}
staticIPBuilder.setDnsServers(dnsServers);
return 0;
@@ -1356,7 +1359,7 @@
staticConfig.getIpAddress().getPrefixLength()));
}
- if (staticConfig.gateway != null) {
+ if (staticConfig.getGateway() != null) {
mGatewayView.setText(staticConfig.getGateway().getHostAddress());
}
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 2d9d444..211ceed 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -844,7 +844,8 @@
// 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;
}