PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hidden connectivity methods access

Browse Source 
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
This commit is contained in:
Chiachang Wang
2021-03-18 15:01:03 +08:00
parent 45726b937b
commit 003e27d146
6 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/Utils.java
View File

@@ -54,6 +54,7 @@ import android.graphics.drawable.VectorDrawable;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
@@ -111,7 +112,6 @@ import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.widget.ActionBarShadowController; import com.android.settingslib.widget.ActionBarShadowController;
import java.net.InetAddress;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -246,13 +246,13 @@ public final class Utils extends com.android.settingslib.Utils {
private static String formatIpAddresses(LinkProperties prop) { private static String formatIpAddresses(LinkProperties prop) {
if (prop == null) return null; 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 there are no entries, return null
if (!iter.hasNext()) return null; if (!iter.hasNext()) return null;
// Concatenate all available addresses, comma separated // Concatenate all available addresses, comma separated
String addresses = ""; String addresses = "";
while (iter.hasNext()) { while (iter.hasNext()) {
addresses += iter.next().getHostAddress(); addresses += iter.next().getAddress().getHostAddress();
if (iter.hasNext()) addresses += "\n"; if (iter.hasNext()) addresses += "\n";
} }
return addresses; return addresses;

5
src/com/android/settings/development/AdbIpAddressPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.development;
import android.content.Context; import android.content.Context;
import android.debug.IAdbManager; import android.debug.IAdbManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.RemoteException; import android.os.RemoteException;
@@ -135,7 +136,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer
return null; return null;
} }
Iterator<InetAddress> iter = prop.getAllAddresses().iterator(); Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();
// If there are no entries, return null // If there are no entries, return null
if (!iter.hasNext()) { if (!iter.hasNext()) {
return null; return null;
@@ -144,7 +145,7 @@ public class AdbIpAddressPreferenceController extends AbstractConnectivityPrefer
// Concatenate all available addresses, newline separated // Concatenate all available addresses, newline separated
StringBuilder addresses = new StringBuilder(); StringBuilder addresses = new StringBuilder();
while (iter.hasNext()) { while (iter.hasNext()) {
InetAddress addr = iter.next(); InetAddress addr = iter.next().getAddress();
if (addr instanceof Inet4Address) { if (addr instanceof Inet4Address) {
// adb only supports ipv4 at the moment // adb only supports ipv4 at the moment
addresses.append(addr.getHostAddress()); addresses.append(addr.getHostAddress());

4
src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
View File

@@ -40,11 +40,13 @@ public class AirplaneModeConditionController implements ConditionalCardControlle
private final ConditionManager mConditionManager; private final ConditionManager mConditionManager;
private final Context mAppContext; private final Context mAppContext;
private final Receiver mReceiver; private final Receiver mReceiver;
private final ConnectivityManager mConnectivityManager;
public AirplaneModeConditionController(Context appContext, ConditionManager conditionManager) { public AirplaneModeConditionController(Context appContext, ConditionManager conditionManager) {
mAppContext = appContext; mAppContext = appContext;
mConditionManager = conditionManager; mConditionManager = conditionManager;
mReceiver = new Receiver(); mReceiver = new Receiver();
mConnectivityManager = mAppContext.getSystemService(ConnectivityManager.class);
} }
@Override @Override
@@ -65,7 +67,7 @@ public class AirplaneModeConditionController implements ConditionalCardControlle
@Override @Override
public void onActionClick() { public void onActionClick() {
ConnectivityManager.from(mAppContext).setAirplaneMode(false); mConnectivityManager.setAirplaneMode(false);
} }
@Override @Override

23
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -812,9 +812,12 @@ public class WifiConfigController implements TextWatcher,
.get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId(); .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
} }
config.setIpConfiguration( final IpConfiguration ipConfig = new IpConfiguration();
new IpConfiguration(mIpAssignment, mProxySettings, ipConfig.setIpAssignment(mIpAssignment);
mStaticIpConfiguration, mHttpProxy)); ipConfig.setProxySettings(mProxySettings);
ipConfig.setStaticIpConfiguration(mStaticIpConfiguration);
ipConfig.setHttpProxy(mHttpProxy);
config.setIpConfiguration(ipConfig);
if (mMeteredSettingsSpinner != null) { if (mMeteredSettingsSpinner != null) {
config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition(); config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
} }
@@ -1382,18 +1385,18 @@ public class WifiConfigController implements TextWatcher,
StaticIpConfiguration staticConfig = config.getIpConfiguration() StaticIpConfiguration staticConfig = config.getIpConfiguration()
.getStaticIpConfiguration(); .getStaticIpConfiguration();
if (staticConfig != null) { if (staticConfig != null) {
if (staticConfig.ipAddress != null) { if (staticConfig.getIpAddress() != null) {
mIpAddressView.setText( mIpAddressView.setText(
staticConfig.ipAddress.getAddress().getHostAddress()); staticConfig.getIpAddress().getAddress().getHostAddress());
mNetworkPrefixLengthView.setText(Integer.toString(staticConfig.ipAddress mNetworkPrefixLengthView.setText(Integer.toString(
.getPrefixLength())); staticConfig.getIpAddress().getPrefixLength()));
} }
if (staticConfig.gateway != null) { if (staticConfig.getGateway() != null) {
mGatewayView.setText(staticConfig.gateway.getHostAddress()); mGatewayView.setText(staticConfig.getGateway().getHostAddress());
} }
Iterator<InetAddress> dnsIterator = staticConfig.dnsServers.iterator(); Iterator<InetAddress> dnsIterator = staticConfig.getDnsServers().iterator();
if (dnsIterator.hasNext()) { if (dnsIterator.hasNext()) {
mDns1View.setText(dnsIterator.next().getHostAddress()); mDns1View.setText(dnsIterator.next().getHostAddress());
} }

15
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -775,9 +775,12 @@ public class WifiConfigController2 implements TextWatcher,
return null; return null;
} }
config.setIpConfiguration( final IpConfiguration ipConfig = new IpConfiguration();
new IpConfiguration(mIpAssignment, mProxySettings, ipConfig.setIpAssignment(mIpAssignment);
mStaticIpConfiguration, mHttpProxy)); ipConfig.setProxySettings(mProxySettings);
ipConfig.setStaticIpConfiguration(mStaticIpConfiguration);
ipConfig.setHttpProxy(mHttpProxy);
config.setIpConfiguration(ipConfig);
if (mMeteredSettingsSpinner != null) { if (mMeteredSettingsSpinner != null) {
config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition(); config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
} }
@@ -920,7 +923,7 @@ public class WifiConfigController2 implements TextWatcher,
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
dnsServers.add(dnsAddr); dnsServers.add(dnsAddr);
staticIpConfiguration.dnsServers.add(dnsAddr); staticIpConfiguration.getDnsServers().add(dnsAddr);
} }
if (mDns2View.length() > 0) { if (mDns2View.length() > 0) {
@@ -930,7 +933,7 @@ public class WifiConfigController2 implements TextWatcher,
return R.string.wifi_ip_settings_invalid_dns; return R.string.wifi_ip_settings_invalid_dns;
} }
dnsServers.add(dnsAddr); dnsServers.add(dnsAddr);
staticIpConfiguration.dnsServers.add(dnsAddr); staticIpConfiguration.getDnsServers().add(dnsAddr);
} }
staticIPBuilder.setDnsServers(dnsServers); staticIPBuilder.setDnsServers(dnsServers);
return 0; return 0;
@@ -1356,7 +1359,7 @@ public class WifiConfigController2 implements TextWatcher,
staticConfig.getIpAddress().getPrefixLength())); staticConfig.getIpAddress().getPrefixLength()));
} }
if (staticConfig.gateway != null) { if (staticConfig.getGateway() != null) {
mGatewayView.setText(staticConfig.getGateway().getHostAddress()); mGatewayView.setText(staticConfig.getGateway().getHostAddress());
} }

3
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -844,7 +844,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
// Find IPv4 default gateway. // Find IPv4 default gateway.
String gateway = null; String gateway = null;
for (RouteInfo routeInfo : mLinkProperties.getRoutes()) { for (RouteInfo routeInfo : mLinkProperties.getRoutes()) {
if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) { if (routeInfo.hasGateway() && routeInfo.isDefaultRoute()
&& routeInfo.getDestination().getAddress() instanceof Inet4Address) {
gateway = routeInfo.getGateway().getHostAddress(); gateway = routeInfo.getGateway().getHostAddress();
break; break;
} }