Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ec371cb authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Fix build."

parents 7e14285f 247675e5

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java

+4 −4
Original line number Diff line number Diff line
@@ -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;

            }

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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));