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

Chunk
Conflicting content
     */
    public NetworkInfo getActiveNetworkInfo() {
        enforceAccessPermission();
<<<<<<< HEAD
        if (mActiveDefaultNetwork != -1) {
            return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
=======
        for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
            if (mNetConfigs[type] == null || !mNetConfigs[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;
            }
>>>>>>> 70c3d1c23b5d4398cc561ec9ddbe868b3182cc74
        }
        return null;
    }
Solution content
        if (mActiveDefaultNetwork != -1) {
     */
    public NetworkInfo getActiveNetworkInfo() {
        enforceAccessPermission();
            return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
        }
        return null;
    }
File
ConnectivityService.java
Developer's decision
Version 1
Kind of conflict
Array access
For statement
If statement
Method invocation
Return statement
Variable