Projects >> platform_frameworks_base >>53691e39dca8be5dbe19bfef05b1c3e294d6c0bd

Chunk
Conflicting content 
    /**
=======
>>>>>>> 128e937108035b77537f279dc0bc85a116906819
     * Replaces the RouteInfos on this link with the given collection of RouteInfos.
     */
    }

    /**
<<<<<<< HEAD
     * Returns all the routes on this link and all the links stacked above it.
     */
    public Collection getAllRoutes() {
        Collection routes = new ArrayList();
        routes.addAll(mRoutes);
        for (LinkProperties stacked: mStackedLinks.values()) {
            routes.addAll(stacked.getAllRoutes());
        }
        return routes;
    }

    public void setRoutes(Collection routes) {
Solution content 
    }

    /**
     * Returns all the routes on this link and all the links stacked above it.
     */
    public Collection getAllRoutes() {
        Collection routes = new ArrayList();
        routes.addAll(mRoutes);
        for (LinkProperties stacked: mStackedLinks.values()) {
            routes.addAll(stacked.getAllRoutes());
        }
        return routes;
    }

    /**
     * Replaces the RouteInfos on this link with the given collection of RouteInfos.
     */
    public void setRoutes(Collection routes) {
File
LinkProperties.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiWatchdogStateMachine;
import android.net.DhcpInfo;
<<<<<<< HEAD:services/java/com/android/server/wifi/WifiService.java
import android.net.DhcpResults;
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.NetworkUtils;
import android.net.RouteInfo;
=======
import android.net.LinkProperties;
import android.net.NetworkInfo;
import android.net.NetworkInfo.State;
import android.net.NetworkInfo.DetailedState;
import android.net.TrafficStats;
>>>>>>> 128e937108035b77537f279dc0bc85a116906819:services/java/com/android/server/WifiService.java
import android.os.Binder;
import android.os.Handler;
import android.os.Messenger;
Solution content 
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiWatchdogStateMachine;
import android.net.DhcpInfo;
import android.net.DhcpResults;
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.NetworkUtils;
import android.net.RouteInfo;
import android.os.Binder;
import android.os.Handler;
import android.os.Messenger;
File
WifiService.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            mLinkProperties = mWifiConfigStore.getLinkProperties(mLastNetworkId);
            mLinkProperties = WifiConfiguration.stripUndisplayableConfig(mLinkProperties);
        } else {
<<<<<<< HEAD
            synchronized (mDhcpResultsLock) {
                if ((mDhcpResults != null) && (mDhcpResults.linkProperties != null)) {
                    mLinkProperties = WifiConfiguration.stripUndisplayableConfig(
                        mDhcpResults.linkProperties);
                }
=======
            synchronized (mDhcpInfoInternal) {
                mLinkProperties = mDhcpInfoInternal.makeLinkProperties();
                mLinkProperties = WifiConfiguration.stripUndisplayableConfig(mLinkProperties);
>>>>>>> 128e937108035b77537f279dc0bc85a116906819
            }
            mLinkProperties.setHttpProxy(mWifiConfigStore.getProxyProperties(mLastNetworkId));
        }
Solution content 
            mLinkProperties.setHttpProxy(mWifiConfigStore.getProxyProperties(mLastNetworkId));
        }
            mLinkProperties = mWifiConfigStore.getLinkProperties(mLastNetworkId);
            mLinkProperties = WifiConfiguration.stripUndisplayableConfig(mLinkProperties);
        } else {
            synchronized (mDhcpResultsLock) {
                if ((mDhcpResults != null) && (mDhcpResults.linkProperties != null)) {
                    mLinkProperties = WifiConfiguration.stripUndisplayableConfig(
                        mDhcpResults.linkProperties);
                }
            }
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Synchronized statement
Chunk
Conflicting content 
            //DHCP renewal in connected state
            linkProperties.setHttpProxy(mWifiConfigStore.getProxyProperties(mLastNetworkId));
            linkProperties = WifiConfiguration.stripUndisplayableConfig(linkProperties);
<<<<<<< HEAD
=======
            linkProperties.setInterfaceName(mInterfaceName);
>>>>>>> 128e937108035b77537f279dc0bc85a116906819
            if (!linkProperties.equals(mLinkProperties)) {
                if (DBG) {
                    log("Link configuration changed for netId: " + mLastNetworkId
Solution content 
            //DHCP renewal in connected state
            linkProperties.setHttpProxy(mWifiConfigStore.getProxyProperties(mLastNetworkId));
            linkProperties = WifiConfiguration.stripUndisplayableConfig(linkProperties);
            if (!linkProperties.equals(mLinkProperties)) {
                if (DBG) {
                    log("Link configuration changed for netId: " + mLastNetworkId
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Method invocation