Projects >> android-frameworks-base-with-screenshot-tweaks >>74f1b609510c942b2e56b045a6685f5a6d53ccce

Chunk
Conflicting content 
import android.os.Bundle;
import android.test.InstrumentationTestRunner;
import android.test.InstrumentationTestSuite;
<<<<<<< HEAD

=======
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
import com.android.connectivitymanagertest.stress.WifiApStress;
import com.android.connectivitymanagertest.stress.WifiStressTest;
Solution content 
import android.os.Bundle;
import android.test.InstrumentationTestRunner;
import android.test.InstrumentationTestSuite;

import com.android.connectivitymanagertest.stress.WifiApStress;
import com.android.connectivitymanagertest.stress.WifiStressTest;
File
ConnectivityManagerStressTestRunner.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    @Override
    public TestSuite getAllTests() {
        TestSuite suite = new InstrumentationTestSuite(this);
<<<<<<< HEAD
        if (!UtilHelper.isWifiOnly()) {
            suite.addTestSuite(WifiApStress.class);
            suite.addTestSuite(WifiStressTest.class);
        } else {
            // only the wifi stress tests
            suite.addTestSuite(WifiStressTest.class);
        }
=======
        suite.addTestSuite(WifiApStress.class);
        suite.addTestSuite(WifiStressTest.class);
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
        return suite;
    }
Solution content 
    @Override
    public TestSuite getAllTests() {
        TestSuite suite = new InstrumentationTestSuite(this);
        if (!UtilHelper.isWifiOnly()) {
            suite.addTestSuite(WifiApStress.class);
            suite.addTestSuite(WifiStressTest.class);
        } else {
            // only the wifi stress tests
            suite.addTestSuite(WifiStressTest.class);
        }
        return suite;
    }
File
ConnectivityManagerStressTestRunner.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
    @Override
    public void onCreate(Bundle icicle) {
        super.onCreate(icicle);
<<<<<<< HEAD
        if (!UtilHelper.isWifiOnly()) {
            String valueStr = (String) icicle.get("softap_iterations");
            if (valueStr != null) {
                int iteration = Integer.parseInt(valueStr);
                if (iteration > 0) {
                    mSoftapIterations = iteration;
                }
            }
        }

        String scanIterationStr = (String) icicle.get("scan_iterations");
        if (scanIterationStr != null) {
            int scanIteration = Integer.parseInt(scanIterationStr);
            if (scanIteration > 0) {
                mScanIterations = scanIteration;
            }
        }

        String ssidStr= (String) icicle.get("reconnect_ssid");
        if (ssidStr != null) {
            mReconnectSsid = ssidStr;
        }

        String passwordStr = (String) icicle.get("reconnect_password");
        if (passwordStr != null) {
            mReconnectPassword = passwordStr;
        }

        String reconnectStr = (String) icicle.get("reconnect_iterations");
        if (reconnectStr != null) {
            int iteration = Integer.parseInt(reconnectStr);
            if (iteration > 0) {
=======
        String valueStr = (String) icicle.get("softap_iterations");
        if (valueStr != null) {
            int iteration = Integer.parseInt(valueStr);
            if (iteration > 0) {
                mSoftapIterations = iteration;
            }
        }

        String scanIterationStr = (String) icicle.get("scan_iterations");
        if (scanIterationStr != null) {
            int scanIteration = Integer.parseInt(scanIterationStr);
            if (scanIteration > 0) {
                mScanIterations = scanIteration;
            }
        }

        String ssidStr= (String) icicle.get("reconnect_ssid");
        if (ssidStr != null) {
            mReconnectSsid = ssidStr;
        }

        String passwordStr = (String) icicle.get("reconnect_password");
        if (passwordStr != null) {
            mReconnectPassword = passwordStr;
        }

        String reconnectStr = (String) icicle.get("reconnect_iterations");
        if (reconnectStr != null) {
            int iteration = Integer.parseInt(reconnectStr);
            if (iteration > 0) {
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
                mReconnectIterations = iteration;
            }
        }
Solution content 
    @Override
    public void onCreate(Bundle icicle) {
        super.onCreate(icicle);
        if (!UtilHelper.isWifiOnly()) {
            String valueStr = (String) icicle.get("softap_iterations");
            if (valueStr != null) {
                int iteration = Integer.parseInt(valueStr);
                if (iteration > 0) {
                    mSoftapIterations = iteration;
                }
            }
        }

        String scanIterationStr = (String) icicle.get("scan_iterations");
        if (scanIterationStr != null) {
            int scanIteration = Integer.parseInt(scanIterationStr);
            if (scanIteration > 0) {
                mScanIterations = scanIteration;
            }
        }

        String ssidStr= (String) icicle.get("reconnect_ssid");
        if (ssidStr != null) {
            mReconnectSsid = ssidStr;
        }

        String passwordStr = (String) icicle.get("reconnect_password");
        if (passwordStr != null) {
            mReconnectPassword = passwordStr;
        }

        String reconnectStr = (String) icicle.get("reconnect_iterations");
        if (reconnectStr != null) {
            int iteration = Integer.parseInt(reconnectStr);
            if (iteration > 0) {
                mReconnectIterations = iteration;
            }
        }
File
ConnectivityManagerStressTestRunner.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Method invocation
Variable
Chunk
Conflicting content 
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.os.Bundle;
<<<<<<< HEAD
import android.os.Handler;
import android.os.IPowerManager;
import android.os.Message;
=======
import android.os.IPowerManager;
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
import android.os.PowerManager;
import android.os.ServiceManager;
import android.os.SystemClock;
Solution content 
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.os.Bundle;
import android.os.Handler;
import android.os.IPowerManager;
import android.os.Message;
import android.os.PowerManager;
import android.os.ServiceManager;
import android.os.SystemClock;
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import android.view.KeyEvent;
import android.widget.LinearLayout;

<<<<<<< HEAD
import com.android.internal.util.AsyncChannel;

=======
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
import java.io.IOException;
import java.io.InputStream;
import java.net.UnknownHostException;
Solution content 
import android.view.KeyEvent;
import android.widget.LinearLayout;

import com.android.internal.util.AsyncChannel;

import java.io.IOException;
import java.io.InputStream;
import java.net.UnknownHostException;
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            } else if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
                mWifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
                                                WifiManager.WIFI_STATE_UNKNOWN);
<<<<<<< HEAD
=======
                log("mWifiState: " + mWifiState);
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
                notifyWifiState();
            } else if (action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
                notifyWifiAPState();
Solution content 
            } else if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
                mWifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
                                                WifiManager.WIFI_STATE_UNKNOWN);
                notifyWifiState();
            } else if (action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
                notifyWifiAPState();
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        return mParseHelper.getNetworkConfigurations();
    }

<<<<<<< HEAD
=======
    public HashMap getDhcpInfo() throws Exception{
        if (mParseHelper == null) {
            InputStream in = getAssets().open(ACCESS_POINT_FILE);
            mParseHelper = new AccessPointParserHelper(in);
        }
        return mParseHelper.getSsidToDhcpInfoHashMap();
    }


    private void printNetConfig(String[] configuration) {
        for (int i = 0; i < configuration.length; i++) {
            if (i == 0) {
                log("SSID: " + configuration[0]);
            } else {
                log("      " + configuration[i]);
            }
        }
    }

>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
    // for each network type, initialize network states to UNKNOWN, and no verification flag is set
    public void initializeNetworkStates() {
        for (int networkType = NUM_NETWORK_TYPES - 1; networkType >=0; networkType--) {
Solution content 
        return mParseHelper.getNetworkConfigurations();
    }

    // for each network type, initialize network states to UNKNOWN, and no verification flag is set
    public void initializeNetworkStates() {
        for (int networkType = NUM_NETWORK_TYPES - 1; networkType >=0; networkType--) {
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
            }
        }

<<<<<<< HEAD
        boolean foundApInScanResults = false;
        for (int retry = 0; retry < 5; retry++) {
            List netList = mWifiManager.getScanResults();
            if (netList != null) {
                log("size of scan result list: " + netList.size());
                for (int i = 0; i < netList.size(); i++) {
                    ScanResult sr= netList.get(i);
                    if (sr.SSID.equals(ssid)) {
                        log("found " + ssid + " in the scan result list");
                        log("retry: " + retry);
                        foundApInScanResults = true;
                        mWifiManager.connectNetwork(config);
                        break;
                   }
=======
        List netList = mWifiManager.getScanResults();
        if (netList == null) {
            log("scan results are null");
            // if no scan results are available, start active scan
            mWifiManager.startScanActive();
            mScanResultIsAvailable = false;
            long startTime = System.currentTimeMillis();
            while (!mScanResultIsAvailable) {
                if ((System.currentTimeMillis() - startTime) > WIFI_SCAN_TIMEOUT) {
                    return false;
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
                }
            }
            if (foundApInScanResults) {
Solution content 
            }
        }

        boolean foundApInScanResults = false;
        for (int retry = 0; retry < 5; retry++) {
            List netList = mWifiManager.getScanResults();
            if (netList != null) {
                log("size of scan result list: " + netList.size());
                for (int i = 0; i < netList.size(); i++) {
                    ScanResult sr= netList.get(i);
                    if (sr.SSID.equals(ssid)) {
                        log("found " + ssid + " in the scan result list");
                        log("retry: " + retry);
                        foundApInScanResults = true;
                        mWifiManager.connectNetwork(config);
                        break;
                   }
                }
            }
            if (foundApInScanResults) {
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
For statement
If statement
Method invocation
Return statement
Variable
While statement
Chunk
Conflicting content 
                }
            }
        }
<<<<<<< HEAD
        return false;
=======

        netList = mWifiManager.getScanResults();

        for (int i = 0; i < netList.size(); i++) {
            ScanResult sr= netList.get(i);
            if (sr.SSID.equals(ssid)) {
                log("found " + ssid + " in the scan result list");
                int networkId = mWifiManager.addNetwork(config);
                // Connect to network by disabling others.
                mWifiManager.enableNetwork(networkId, true);
                mWifiManager.saveConfiguration();
                mWifiManager.reconnect();
                break;
           }
        }

        List netConfList = mWifiManager.getConfiguredNetworks();
        if (netConfList.size() <= 0) {
            log(ssid + " is not available");
            return false;
        }
        return true;
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
    }

    /*
Solution content 
                }
            }
        }
        return false;
    }

    /*
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
For statement
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
     */
    public boolean disconnectAP() {
        if (mWifiManager.isWifiEnabled()) {
<<<<<<< HEAD
            // remove saved networks
            List wifiConfigList = mWifiManager.getConfiguredNetworks();
            for (WifiConfiguration wifiConfig: wifiConfigList) {
                log("remove wifi configuration: " + wifiConfig.toString());
                mWifiManager.forgetNetwork(wifiConfig.networkId);
=======
            //remove the current network Id
            WifiInfo curWifi = mWifiManager.getConnectionInfo();
            if (curWifi == null) {
                return false;
            }
            int curNetworkId = curWifi.getNetworkId();
            mWifiManager.removeNetwork(curNetworkId);
            mWifiManager.saveConfiguration();

            // remove other saved networks
            List netConfList = mWifiManager.getConfiguredNetworks();
            if (netConfList != null) {
                log("remove configured network ids");
                for (int i = 0; i < netConfList.size(); i++) {
                    WifiConfiguration conf = new WifiConfiguration();
                    conf = netConfList.get(i);
                    mWifiManager.removeNetwork(conf.networkId);
                }
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
            }
        }
        return true;
Solution content 
     */
    public boolean disconnectAP() {
        if (mWifiManager.isWifiEnabled()) {
            // remove saved networks
            List wifiConfigList = mWifiManager.getConfiguredNetworks();
            for (WifiConfiguration wifiConfig: wifiConfigList) {
                log("remove wifi configuration: " + wifiConfig.toString());
                mWifiManager.forgetNetwork(wifiConfig.networkId);
            }
        }
        return true;
File
ConnectivityManagerTestActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
import android.net.wifi.WifiManager;
import android.os.Environment;
<<<<<<< HEAD
import android.os.IPowerManager;
import android.os.PowerManager;
import android.os.ServiceManager;
import android.os.SystemClock;
=======
>>>>>>> 01a111486d06c21ddb723195c177c8991d5db151
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
Solution content 
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
import android.net.wifi.WifiManager;
import android.os.Environment;
import android.os.IPowerManager;
import android.os.PowerManager;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
File
WifiApStress.java
Developer's decision
Version 1
Kind of conflict
Import