Projects >> android_frameworks_base >>fe99eb7548929e7eaa275c62f5ffe7e76e176e98

Chunk
Conflicting content
    }

    @Override
<<<<<<< HEAD
=======
    protected boolean isApnTypeActive(String type) {
        // TODO: support simultaneous with List instead
        if (Phone.APN_TYPE_DUN.equals(type)) {
            ApnSetting dunApn = fetchDunApn();
            if (dunApn != null) {
                return ((mActiveApn != null) && (dunApn.toString().equals(mActiveApn.toString())));
            }
        }
        return mActiveApn != null && mActiveApn.canHandleType(type);
    }

    @Override
>>>>>>> 55b53d351073238f9083e185eae213639e1937ff
    protected boolean isApnTypeAvailable(String type) {
        if (type.equals(Phone.APN_TYPE_DUN)) {
            return (fetchDunApn() != null);
Solution content
    }

    @Override
    protected boolean isApnTypeAvailable(String type) {
        if (type.equals(Phone.APN_TYPE_DUN)) {
            return (fetchDunApn() != null);
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration