Projects >> android-frameworks-base >>3aecdb9d7e92b1a91860600feefb5c0062b652cf

Chunk
Conflicting content 
            Phone.APN_TYPE_MMS,
            Phone.APN_TYPE_HIPRI };

<<<<<<< HEAD
    // if we have no active Apn this is null
    protected ApnSetting mActiveApn;

    // Possibly promoate to base class, the only difference is
=======
    // Possibly promote to base class, the only difference is
>>>>>>> e25863c9093d3f60a1f6feab1d17d38946a8d020
    // the INTENT_RECONNECT_ALARM action is a different string.
    // Do consider technology changes if it is promoted.
    BroadcastReceiver mIntentReceiver = new BroadcastReceiver ()
Solution content 
            Phone.APN_TYPE_MMS,
            Phone.APN_TYPE_HIPRI };

    // if we have no active Apn this is null
    protected ApnSetting mActiveApn;

    // Possibly promote to base class, the only difference is
    // the INTENT_RECONNECT_ALARM action is a different string.
    // Do consider technology changes if it is promoted.
    BroadcastReceiver mIntentReceiver = new BroadcastReceiver ()
File
CdmaDataConnectionTracker.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
                waitingApns = buildWaitingApns();
                if (waitingApns.isEmpty()) {
                    if (DBG) log("No APN found");
<<<<<<< HEAD
                    notifyNoData(GsmDataConnection.FailCause.MISSING_UKNOWN_APN);
=======
                    notifyNoData(DataConnection.FailCause.MISSING_UNKNOWN_APN);
>>>>>>> e25863c9093d3f60a1f6feab1d17d38946a8d020
                    return false;
                } else {
                    log ("Create from allApns : " + apnListToString(allApns));
Solution content 
                waitingApns = buildWaitingApns();
                if (waitingApns.isEmpty()) {
                    if (DBG) log("No APN found");
                    notifyNoData(GsmDataConnection.FailCause.MISSING_UNKNOWN_APN);
                    return false;
                } else {
                    log ("Create from allApns : " + apnListToString(allApns));
File
GsmDataConnectionTracker.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
        if (allApns.isEmpty()) {
            if (DBG) log("No APN found for carrier: " + operator);
            preferredApn = null;
<<<<<<< HEAD
            notifyNoData(GsmDataConnection.FailCause.MISSING_UKNOWN_APN);
=======
            notifyNoData(DataConnection.FailCause.MISSING_UNKNOWN_APN);
>>>>>>> e25863c9093d3f60a1f6feab1d17d38946a8d020
        } else {
            preferredApn = getPreferredApn();
            Log.d(LOG_TAG, "Get PreferredAPN");
Solution content 
        if (allApns.isEmpty()) {
            if (DBG) log("No APN found for carrier: " + operator);
            preferredApn = null;
            notifyNoData(GsmDataConnection.FailCause.MISSING_UNKNOWN_APN);
        } else {
            preferredApn = getPreferredApn();
            Log.d(LOG_TAG, "Get PreferredAPN");
File
GsmDataConnectionTracker.java
Developer's decision
Manual
Kind of conflict
Method invocation