Projects >> android_frameworks_base >>6244f0fc168291b428ba2595e0a3a0d5d4be2bd4

Chunk
Conflicting content 
     */
    public void privateDnsRouteSet(boolean enabled);

<<<<<<< HEAD
    /**
     * Check if default route is set
     */
    public boolean isDefaultRouteSet();

    /**
     * Set a flag indicating default route is set for the network
     */
    public void defaultRouteSet(boolean enabled);

    /**
     * Check if tear down was requested
     */
    public boolean isTeardownRequested();

    /**
     * Indicate tear down requested from connectivity
     */
    public void setTeardownRequested(boolean isRequested);
=======
    public String getInterfaceName() {
        return mInterfaceName;
    }
>>>>>>> ce6766ea51a943b9f8908cb18d0d9762497b478c
}
Solution content 
     */
    public void privateDnsRouteSet(boolean enabled);

    /**
     * Check if default route is set
     */
    public boolean isDefaultRouteSet();

    /**
     * Set a flag indicating default route is set for the network
     */
    public void defaultRouteSet(boolean enabled);

    /**
     * Check if tear down was requested
     */
    public boolean isTeardownRequested();

    /**
     * Indicate tear down requested from connectivity
     */
    public void setTeardownRequested(boolean isRequested);
}
File
NetworkStateTracker.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Method interface
Chunk
Conflicting content 
     */
    public NetworkInfo getActiveNetworkInfo() {
        enforceAccessPermission();
<<<<<<< HEAD
        for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
            if (mNetAttributes[type] == null || !mNetAttributes[type].isDefault()) {
                continue;
            }
            NetworkStateTracker t = mNetTrackers[type];
            NetworkInfo info = t.getNetworkInfo();
            if (info.isConnected()) {
                if (DBG && type != mActiveDefaultNetwork) {
                    loge("connected default network is not mActiveDefaultNetwork!");
                }
                return info;
            }
=======
        if (mActiveDefaultNetwork != -1) {
            return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
>>>>>>> ce6766ea51a943b9f8908cb18d0d9762497b478c
        }
        return null;
    }
Solution content 
     */
    public NetworkInfo getActiveNetworkInfo() {
        enforceAccessPermission();
        if (mActiveDefaultNetwork != -1) {
            return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
        }
        return null;
    }
File
ConnectivityService.java
Developer's decision
Version 2
Kind of conflict
Array access
For statement
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
            } else {
<<<<<<< HEAD
                handleApplyDefaultProxy(netType);
                addDefaultRoute(mNetTrackers[netType]);
                addPrivateDnsRoutes(mNetTrackers[netType]);
=======
                // many radios add a default route even when we don't want one.
                // remove the default interface unless we need it for our active network
                if (mActiveDefaultNetwork != -1) {
                    String defaultIface = mNetTrackers[mActiveDefaultNetwork].getInterfaceName();
                    if (defaultIface != null &&
                            !defaultIface.equals(mNetTrackers[netType].getInterfaceName())) {
                        mNetTrackers[netType].removeDefaultRoute();
                    }
                }
                mNetTrackers[netType].addPrivateDnsRoutes();
>>>>>>> ce6766ea51a943b9f8908cb18d0d9762497b478c
            }
        } else {
            if (mNetAttributes[netType].isDefault()) {
Solution content 
                handleApplyDefaultProxy(netType);
                addDefaultRoute(mNetTrackers[netType]);
            } else {
                // many radios add a default route even when we don't want one.
                // remove the default interface unless we need it for our active network
                if (mActiveDefaultNetwork != -1) {
                    LinkProperties linkProperties =
                            mNetTrackers[mActiveDefaultNetwork].getLinkProperties();
                    LinkProperties newLinkProperties =
                            mNetTrackers[netType].getLinkProperties();
                    String defaultIface = linkProperties.getInterfaceName();
                    if (defaultIface != null &&
                            !defaultIface.equals(newLinkProperties.getInterfaceName())) {
                        mNetTrackers[netType].removeDefaultRoute();
                    }
                }
                mNetTrackers[netType].addPrivateDnsRoutes();
            }
        } else {
            if (mNetAttributes[netType].isDefault()) {
File
ConnectivityService.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation