Projects >> frameworks_base_disabled >>ae367419df6e5f55b081fa793b535cc84b55d6ed

Chunk
Conflicting content 
        /*
         * stop DHCP
         */
<<<<<<< HEAD
=======
       NetworkUtils.resetConnections(mInterfaceName, NetworkUtils.RESET_ALL_ADDRESSES);

>>>>>>> e4a56a32ac243dad5e7fa33c5de4777d9a4b8162
        if (mDhcpStateMachine != null) {
            mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP);
            mDhcpStateMachine.quit();
Solution content 
        /*
         * stop DHCP
         */
        if (mDhcpStateMachine != null) {
            mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_STOP_DHCP);
            mDhcpStateMachine.quit();
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            if (!linkProperties.equals(mLinkProperties)) {
                Log.d(TAG, "Link configuration changed for netId: " + mLastNetworkId
                    + " old: " + mLinkProperties + "new: " + linkProperties);
<<<<<<< HEAD
=======
                NetworkUtils.resetConnections(mInterfaceName, NetworkUtils.RESET_ALL_ADDRESSES);
>>>>>>> e4a56a32ac243dad5e7fa33c5de4777d9a4b8162
                mLinkProperties = linkProperties;
                sendLinkConfigurationChangedBroadcast();
            }
Solution content 
            if (!linkProperties.equals(mLinkProperties)) {
                Log.d(TAG, "Link configuration changed for netId: " + mLastNetworkId
                    + " old: " + mLinkProperties + "new: " + linkProperties);
                mLinkProperties = linkProperties;
                sendLinkConfigurationChangedBroadcast();
            }
File
WifiStateMachine.java
Developer's decision
Version 1
Kind of conflict
Method invocation