Projects >> android-frameworks-base-with-screenshot-tweaks >>d9212d3088d2ecb794933c2f96392ea160b857eb

Chunk
Conflicting content
            }
            if (mNetConfigs[netType].isDefault()) {
                handleApplyDefaultProxy(netType);
<<<<<<< HEAD
                addDefaultRoute(mNetTrackers[netType]);
            } else {
                // many radios add a default route even when we don't want one.
                // remove the default route unless we need it for our active network
                if (mActiveDefaultNetwork != -1) {
                    LinkProperties defaultLinkProperties =
                            mNetTrackers[mActiveDefaultNetwork].getLinkProperties();
                    LinkProperties newLinkProperties =
                            mNetTrackers[netType].getLinkProperties();
                    String defaultIface = defaultLinkProperties.getInterfaceName();
                    if (defaultIface != null &&
                            !defaultIface.equals(newLinkProperties.getInterfaceName())) {
                        removeDefaultRoute(mNetTrackers[netType]);
                    }
                }
                addPrivateDnsRoutes(mNetTrackers[netType]);
=======
>>>>>>> 8550f3b86aabe04e149866839bde78b335cc1104
            }
        } else {
            if (VDBG) {
Solution content
            }
            if (mNetConfigs[netType].isDefault()) {
                handleApplyDefaultProxy(netType);
            }
        } else {
            if (VDBG) {
File
ConnectivityService.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation