Projects >> android-frameworks-base-with-screenshot-tweaks >>56ccae6948c73e7085018322a295cabce0d36b00

Chunk
Conflicting content 
    @Override
    protected boolean isApnTypeActive(String type) {
<<<<<<< HEAD
        return (mIsApnActive && isApnTypeAvailable(type));
=======
        return (isApnTypeAvailable(type) &&
                (state == State.CONNECTED || state == State.INITING));
>>>>>>> 44685eb45e81d281357291ec3a0a90a05ad1942d
    }

    @Override
Solution content 
    @Override
    protected boolean isApnTypeActive(String type) {
        return (mIsApnActive && isApnTypeAvailable(type));
    }

    @Override
File
CdmaDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Return statement
Chunk
Conflicting content 
    }

    protected String[] getActiveApnTypes() {
<<<<<<< HEAD
        String[] result;
        if (mIsApnActive) {
            result = mSupportedApnTypes.clone();
        } else {
            // TODO - should this return an empty array?  See GSM too.
            result = new String[1];
            result[0] = Phone.APN_TYPE_DEFAULT;
=======
        if (state == State.CONNECTED || state == State.INITING) {
            return mSupportedApnTypes.clone();
>>>>>>> 44685eb45e81d281357291ec3a0a90a05ad1942d
        }
        return result;
    }
Solution content 
    }

    protected String[] getActiveApnTypes() {
        String[] result;
        if (mIsApnActive) {
            result = mSupportedApnTypes.clone();
        } else {
            // TODO - should this return an empty array?  See GSM too.
            result = new String[1];
            result[0] = Phone.APN_TYPE_DEFAULT;
        }
        return result;
    }
File
CdmaDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Array access
Comment
If statement
Method invocation
Return statement
Variable