Projects >> android-frameworks-base-with-remote-control-service >>d685c731bf8116f42b980dc31fc7cf29e6ce1fc4

Chunk
Conflicting content
                Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() +
                        " (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr);
            }
<<<<<<< HEAD
            InetAddress inetAddress = NetworkUtils.intToInetAddress(mDefaultGatewayAddr);
            if (inetAddress == null) {
                if (DBG) Log.d(TAG, " Unable to add default route. mDefaultGatewayAddr Error");
            } else {
                NetworkUtils.addHostRoute(mInterfaceName, inetAddress, null);
                if (!NetworkUtils.addDefaultRoute(mInterfaceName, inetAddress) && DBG) {
                    Log.d(TAG, "  Unable to add default route.");
                }
            }
=======
            NetworkUtils.addHostRoute(mInterfaceName, mDefaultGatewayAddr);
            NetworkUtils.setDefaultRoute(mInterfaceName, mDefaultGatewayAddr);
>>>>>>> 7544b23e52c004cda817874c54d88080b6e90bdc
        }
    }
Solution content
                Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() +
                        " (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr);
            }
            InetAddress inetAddress = NetworkUtils.intToInetAddress(mDefaultGatewayAddr);
            if (inetAddress == null) {
                if (DBG) Log.d(TAG, " Unable to add default route. mDefaultGatewayAddr Error");
            } else {
                NetworkUtils.addHostRoute(mInterfaceName, inetAddress, null);
                if (!NetworkUtils.addDefaultRoute(mInterfaceName, inetAddress) && DBG) {
                    Log.d(TAG, "  Unable to add default route.");
                }
            }
        }
    }
File
NetworkStateTracker.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable