Projects >> platform_frameworks_base >>b21b62327c10e92baf1a88e77f1c6d5576a17d62

Chunk
Conflicting content
                Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() +
                        " (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr);
            }
<<<<<<< HEAD
            NetworkUtils.setDefaultRoute(mInterfaceName, mDefaultGatewayAddr);
=======
            InetAddress inetAddress = NetworkUtils.intToInetAddress(mDefaultGatewayAddr);
            if (inetAddress == null) {
                if (DBG) Log.d(TAG, " Unable to add default route. mDefaultGatewayAddr Error");
            } else {
                if (NetworkUtils.addDefaultRoute(mInterfaceName, inetAddress)) {
                    mDefaultRouteSet = true;
                } else {
                    if (DBG) Log.d(TAG, "  Unable to add default route.");
                }
            }
>>>>>>> b998f3111df82149567935138945500f33451b1a
        }
    }
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 {
                if (!NetworkUtils.addDefaultRoute(mInterfaceName, inetAddress) && DBG) {
                    Log.d(TAG, "  Unable to add default route.");
                }
            }
        }
    }
File
NetworkStateTracker.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable