diff options
| author | Roshan Pius <rpius@google.com> | 2019-12-03 05:06:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-12-03 05:06:11 +0000 |
| commit | f88b2637ce281c37036157ae1f38641e14bd8b70 (patch) | |
| tree | 01e9714f82a509a4b1fc15eaf3cd4fac7453ce68 | |
| parent | b16ae059c74054528ae04e011552ffff0047a86d (diff) | |
| parent | 1c052333578dda2d9a0536144c2a8b35db41059a (diff) | |
Merge "XmlUtil: Use public IpConfiguration APIs"
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/util/XmlUtil.java | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 084161f68..44711096d 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -485,7 +485,7 @@ public class WifiConfigManager { * @return */ private boolean shouldUseAggressiveRandomization(WifiConfiguration config) { - if (config.getIpConfiguration().ipAssignment == IpConfiguration.IpAssignment.STATIC) { + if (config.getIpConfiguration().getIpAssignment() == IpConfiguration.IpAssignment.STATIC) { return false; } if (mDeviceConfigFacade.isAggressiveMacRandomizationSsidWhitelistEnabled()) { diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java index eab53bf0b..a2f69b285 100644 --- a/service/java/com/android/server/wifi/util/XmlUtil.java +++ b/service/java/com/android/server/wifi/util/XmlUtil.java @@ -834,43 +834,43 @@ public class XmlUtil { throws XmlPullParserException, IOException { // Write IP assignment settings XmlUtil.writeNextValue(out, XML_TAG_IP_ASSIGNMENT, - ipConfiguration.ipAssignment.toString()); - switch (ipConfiguration.ipAssignment) { + ipConfiguration.getIpAssignment().toString()); + switch (ipConfiguration.getIpAssignment()) { case STATIC: writeStaticIpConfigurationToXml( out, ipConfiguration.getStaticIpConfiguration()); break; default: Log.w(TAG, "Ignoring unknown ip assignment type: " - + ipConfiguration.proxySettings); + + ipConfiguration.getIpAssignment()); break; } // Write proxy settings XmlUtil.writeNextValue( out, XML_TAG_PROXY_SETTINGS, - ipConfiguration.proxySettings.toString()); - switch (ipConfiguration.proxySettings) { + ipConfiguration.getProxySettings().toString()); + switch (ipConfiguration.getProxySettings()) { case STATIC: XmlUtil.writeNextValue( out, XML_TAG_PROXY_HOST, - ipConfiguration.httpProxy.getHost()); + ipConfiguration.getHttpProxy().getHost()); XmlUtil.writeNextValue( out, XML_TAG_PROXY_PORT, - ipConfiguration.httpProxy.getPort()); + ipConfiguration.getHttpProxy().getPort()); XmlUtil.writeNextValue( out, XML_TAG_PROXY_EXCLUSION_LIST, generateProxyExclusionListString( - ipConfiguration.httpProxy.getExclusionList())); + ipConfiguration.getHttpProxy().getExclusionList())); break; case PAC: XmlUtil.writeNextValue( out, XML_TAG_PROXY_PAC_FILE, - ipConfiguration.httpProxy.getPacFileUrl().toString()); + ipConfiguration.getHttpProxy().getPacFileUrl().toString()); break; default: Log.w(TAG, "Ignoring unknown proxy settings type: " - + ipConfiguration.proxySettings); + + ipConfiguration.getProxySettings()); break; } } |