diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2014-05-21 00:20:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 00:20:33 +0000 |
| commit | 6ec371cbdd0b11b9baa1dc444f9c3cf245410b2f (patch) | |
| tree | 3b457993703140f7a252b60a1a9bbd4a79d46309 /core | |
| parent | 7e14285ff569bd61f44030570c634efbd6bf637c (diff) | |
| parent | 247675e5d919c6892722bf4442f54b3266366e51 (diff) | |
| download | frameworks_base-6ec371cbdd0b11b9baa1dc444f9c3cf245410b2f.zip frameworks_base-6ec371cbdd0b11b9baa1dc444f9c3cf245410b2f.tar.gz frameworks_base-6ec371cbdd0b11b9baa1dc444f9c3cf245410b2f.tar.bz2 | |
Merge "Fix build."
Diffstat (limited to 'core')
2 files changed, 6 insertions, 6 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java index 2ce87eb..db125e6 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java @@ -174,12 +174,12 @@ public class AccessPointParserHelper { public void endElement(String uri, String localName, String tagName) throws SAXException { if (tagName.equalsIgnoreCase("accesspoint")) { if (mLinkProperties != null) { - config.ipAssignment = IpAssignment.STATIC; - config.linkProperties = mLinkProperties; + config.setIpAssignment(IpAssignment.STATIC); + config.setLinkProperties(mLinkProperties); } else { - config.ipAssignment = IpAssignment.DHCP; + config.setIpAssignment(IpAssignment.DHCP); } - config.proxySettings = ProxySettings.NONE; + config.setProxySettings(ProxySettings.NONE); networks.add(config); mLinkProperties = null; } diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java index 9692ec0..08618d6 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java @@ -233,8 +233,8 @@ public class WifiStressTest } else { config.preSharedKey = '"' + mPassword + '"'; } - config.ipAssignment = IpAssignment.DHCP; - config.proxySettings = ProxySettings.NONE; + config.setIpAssignment(IpAssignment.DHCP); + config.setProxySettings(ProxySettings.NONE); assertTrue("Failed to connect to Wi-Fi network: " + mSsid, connectToWifiWithConfiguration(config)); |