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

Chunk
Conflicting content 
    /** @hide */
    public static final int RADIO_TECHNOLOGY_EVDO_B = 12;
    /** @hide */
<<<<<<< HEAD
    public static final int RADIO_TECHNOLOGY_EHRPD = 13;
    /** @hide */
    public static final int RADIO_TECHNOLOGY_LTE = 14;
    /** @hide */
    public static final int RADIO_TECHNOLOGY_HSPAP = 15;
=======
    public static final int RADIO_TECHNOLOGY_LTE = 13;
    /** @hide */
    public static final int RADIO_TECHNOLOGY_EHRPD = 14;
>>>>>>> d79459670576da8aafc831ac0872f550d4137164

    /**
     * Available registration states for GSM, UMTS and CDMA.
Solution content 
    /** @hide */
    public static final int RADIO_TECHNOLOGY_EVDO_B = 12;
    /** @hide */
    public static final int RADIO_TECHNOLOGY_EHRPD = 13;
    /** @hide */
    public static final int RADIO_TECHNOLOGY_LTE = 14;
    /** @hide */
    public static final int RADIO_TECHNOLOGY_HSPAP = 15;

    /**
     * Available registration states for GSM, UMTS and CDMA.
File
ServiceState.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
            radioTechnology = "EvDo rev. B";
            break;
        case 13:
<<<<<<< HEAD
            radioTechnology = "eHRPD";
            break;
        case 14:
            radioTechnology = "LTE";
            break;
        case 15:
            radioTechnology = "HSPAP";
=======
            radioTechnology = "LTE";
            break;
        case 14:
            radioTechnology = "eHRPD";
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
            break;
        default:
            Log.w(LOG_TAG, "mRadioTechnology variable out of range.");
Solution content 
            radioTechnology = "EvDo rev. B";
            break;
        case 13:
            radioTechnology = "eHRPD";
            break;
        case 14:
            radioTechnology = "LTE";
            break;
        case 15:
            radioTechnology = "HSPAP";
            break;
        default:
            Log.w(LOG_TAG, "mRadioTechnology variable out of range.");
File
ServiceState.java
Developer's decision
Version 1
Kind of conflict
Break statement
Case statement
Variable
Chunk
Conflicting content 
 * {@hide}
 */
public interface CommandsInterface {
<<<<<<< HEAD
    static final boolean LTE_AVAILABLE_ON_CDMA =
        SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false);
=======
    // TODO: Get rid of mot from property.
    static final boolean LTE_AVAILABLE_ON_CDMA =
        SystemProperties.getBoolean("ro.mot.lte_on_cdma", false);
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    enum RadioState {
        RADIO_OFF(0),         /* Radio explictly powered off (eg CFUN=0) */
        RADIO_UNAVAILABLE(0), /* Radio unavailable (eg, resetting or not booted) */
Solution content 
 * {@hide}
 */
public interface CommandsInterface {
    static final boolean LTE_AVAILABLE_ON_CDMA =
        SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false);
    enum RadioState {
        RADIO_OFF(0),         /* Radio explictly powered off (eg CFUN=0) */
        RADIO_UNAVAILABLE(0), /* Radio unavailable (eg, resetting or not booted) */
File
CommandsInterface.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
    private static final int EVENT_QUERY_FACILITY_FDN_DONE = 10;
    private static final int EVENT_CHANGE_FACILITY_FDN_DONE = 11;

<<<<<<< HEAD
    static final boolean LTE_AVAILABLE_ON_CDMA =
            SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false);
=======
    // FIXME: remove mot from property
    static final boolean LTE_AVAILABLE_ON_CDMA =
        SystemProperties.getBoolean("ro.mot.lte_on_cdma", false);
>>>>>>> d79459670576da8aafc831ac0872f550d4137164

    /*
      UNKNOWN is a transient state, for example, after uesr inputs ICC pin under
Solution content 
    private static final int EVENT_QUERY_FACILITY_FDN_DONE = 10;
    private static final int EVENT_CHANGE_FACILITY_FDN_DONE = 11;

    static final boolean LTE_AVAILABLE_ON_CDMA =
            SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false);

    /*
      UNKNOWN is a transient state, for example, after uesr inputs ICC pin under
File
IccCard.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
    static final int SOCKET_OPEN_RETRY_MILLIS = 2 * 1000;
    static final int SOCKET_OPEN_MAX_RETRY = 3;
    static final boolean LTE_AVAILABLE_ON_CDMA =
<<<<<<< HEAD
            SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false);
=======
        SystemProperties.getBoolean("ro.mot.lte_on_cdma", false);
>>>>>>> d79459670576da8aafc831ac0872f550d4137164

    //***** Class Variables
Solution content 
    static final int SOCKET_OPEN_RETRY_MILLIS = 2 * 1000;
    static final int SOCKET_OPEN_MAX_RETRY = 3;
    static final boolean LTE_AVAILABLE_ON_CDMA =
            SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false);

    //***** Class Variables
File
PhoneFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            return Phone.PHONE_TYPE_CDMA;

        case RILConstants.NETWORK_MODE_LTE_ONLY:
<<<<<<< HEAD
            if (SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA,
                    false)) {
=======
            if (SystemProperties.getBoolean("ro.mot.lte_on_cdma", false)) {
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
                return Phone.PHONE_TYPE_CDMA;
            } else {
                return Phone.PHONE_TYPE_GSM;
Solution content 
            return Phone.PHONE_TYPE_CDMA;

        case RILConstants.NETWORK_MODE_LTE_ONLY:
            if (SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA,
                    false)) {
                return Phone.PHONE_TYPE_CDMA;
            } else {
                return Phone.PHONE_TYPE_GSM;
File
PhoneFactory.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                } else {
                mPhoneType = RILConstants.CDMA_PHONE;
                break;
            case RILConstants.NETWORK_MODE_LTE_ONLY:
<<<<<<< HEAD
                if (SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA,
                        false)) {
=======
                if (SystemProperties.getBoolean("ro.mot.lte_on_cdma", false)) {
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
                    mPhoneType = RILConstants.CDMA_PHONE;
                    mPhoneType = RILConstants.GSM_PHONE;
Solution content 
                mPhoneType = RILConstants.CDMA_PHONE;
                break;
            case RILConstants.NETWORK_MODE_LTE_ONLY:
                if (SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA,
                        false)) {
                    mPhoneType = RILConstants.CDMA_PHONE;
                } else {
                    mPhoneType = RILConstants.GSM_PHONE;
File
RIL.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    protected abstract void setPowerStateToDesired();
    protected abstract void log(String s);

<<<<<<< HEAD
    public abstract int getCurrentDataConnectionState();
    public abstract boolean isConcurrentVoiceAndDataAllowed();

    /**
     * Registration point for transition into DataConnection attached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForDataConnectionAttached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mAttachedRegistrants.add(r);

        if (getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
    public void unregisterForDataConnectionAttached(Handler h) {
        mAttachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into DataConnection detached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForDataConnectionDetached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mDetachedRegistrants.add(r);

        if (getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
    public void unregisterForDataConnectionDetached(Handler h) {
        mDetachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into network attached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj in Message.obj
     */
    public void registerForNetworkAttached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);

        mNetworkAttachedRegistrants.add(r);
        if (ss.getState() == ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
    public void unregisterForNetworkAttached(Handler h) {
        mNetworkAttachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into packet service restricted zone.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForPsRestrictedEnabled(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mPsRestrictEnabledRegistrants.add(r);

        if (mRestrictedState.isPsRestricted()) {
            r.notifyRegistrant();
        }
    }

    public void unregisterForPsRestrictedEnabled(Handler h) {
        mPsRestrictEnabledRegistrants.remove(h);
    }

    /**
     * Registration point for transition out of packet service restricted zone.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForPsRestrictedDisabled(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mPsRestrictDisabledRegistrants.add(r);

        if (mRestrictedState.isPsRestricted()) {
            r.notifyRegistrant();
        }
    }

    public void unregisterForPsRestrictedDisabled(Handler h) {
        mPsRestrictDisabledRegistrants.remove(h);
=======
    private void logUnexpectedGsmMethodCall(String name) {
        log("SSST" + "Error! " + name + "() in ServiceStateTracker should not be " +
        "called, GsmServiceStateTracker inactive.");
    }

    public abstract int getCurrentDataConnectionState();
    public abstract boolean isConcurrentVoiceAndDataAllowed();
    public void registerForDataConnectionAttached(Handler h, int what, Object obj) {
        logUnexpectedGsmMethodCall("registerForDataConnectionAttached");
    }

    public void unregisterForDataConnectionAttached(Handler h) {
        logUnexpectedGsmMethodCall("unregisterForDataConnectionAttached");
    }

    public void registerForDataConnectionDetached(Handler h, int what, Object obj) {
        logUnexpectedGsmMethodCall("registerForDataConnectionDetached");
    }

    public void unregisterForDataConnectionDetached(Handler h) {
        logUnexpectedGsmMethodCall("unregisterForDataConnectionDetached");
    }

    public void registerForPsRestrictedEnabled(Handler h, int what, Object obj) {
        logUnexpectedGsmMethodCall("registerForPsRestrictedEnabled");
    }

    public void unregisterForPsRestrictedEnabled(Handler h) {
        logUnexpectedGsmMethodCall("unregisterForPsRestrictedEnabled");
    }

    public void registerForPsRestrictedDisabled(Handler h, int what, Object obj) {
        logUnexpectedGsmMethodCall("registerForPsRestrictedDisabled");
    }

    public void unregisterForPsRestrictedDisabled(Handler h) {
        logUnexpectedGsmMethodCall("registerForPsRestrictedDisabled");
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    }

    /**
Solution content 
    /**
    protected abstract void setPowerStateToDesired();
    protected abstract void log(String s);

    public abstract int getCurrentDataConnectionState();
    public abstract boolean isConcurrentVoiceAndDataAllowed();

    /**
     * Registration point for transition into DataConnection attached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForDataConnectionAttached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mAttachedRegistrants.add(r);

        if (getCurrentDataConnectionState() == ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
    public void unregisterForDataConnectionAttached(Handler h) {
        mAttachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into DataConnection detached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForDataConnectionDetached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mDetachedRegistrants.add(r);

        if (getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
    public void unregisterForDataConnectionDetached(Handler h) {
        mDetachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into network attached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj in Message.obj
     */
    public void registerForNetworkAttached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);

        mNetworkAttachedRegistrants.add(r);
        if (ss.getState() == ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }
    public void unregisterForNetworkAttached(Handler h) {
        mNetworkAttachedRegistrants.remove(h);
    }

     * Registration point for transition into packet service restricted zone.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForPsRestrictedEnabled(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mPsRestrictEnabledRegistrants.add(r);

        if (mRestrictedState.isPsRestricted()) {
            r.notifyRegistrant();
        }
    }

    public void unregisterForPsRestrictedEnabled(Handler h) {
        mPsRestrictEnabledRegistrants.remove(h);
    }

    /**
     * Registration point for transition out of packet service restricted zone.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForPsRestrictedDisabled(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        mPsRestrictDisabledRegistrants.add(r);

        if (mRestrictedState.isPsRestricted()) {
            r.notifyRegistrant();
        }
    }

    public void unregisterForPsRestrictedDisabled(Handler h) {
        mPsRestrictDisabledRegistrants.remove(h);
    }

    /**
File
ServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Method interface
Method invocation
Method signature
Chunk
Conflicting content 
    // Constructors
    public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier) {
        super(notifier, context, ci, false);
<<<<<<< HEAD
        initSST();
=======
        mSST = new CdmaServiceStateTracker (this);
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
        init(context, notifier);
    }
Solution content 
    // Constructors
    public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier) {
        super(notifier, context, ci, false);
        initSST();
        init(context, notifier);
    }
File
CDMAPhone.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,
            boolean unitTestMode) {
        super(notifier, context, ci, unitTestMode);
<<<<<<< HEAD
        initSST();
        init(context, notifier);
    }

    protected void initSST() {
        mSST = new CdmaServiceStateTracker(this);
    }
=======
        mSST = new CdmaServiceStateTracker (this);
        init(context, notifier);
    }
>>>>>>> d79459670576da8aafc831ac0872f550d4137164

    protected void init(Context context, PhoneNotifier notifier) {
        mCM.setPhoneType(Phone.PHONE_TYPE_CDMA);
Solution content 
    public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,
            boolean unitTestMode) {
        super(notifier, context, ci, unitTestMode);
        initSST();
        init(context, notifier);
    }

    protected void initSST() {
        mSST = new CdmaServiceStateTracker(this);
    }

    protected void init(Context context, PhoneNotifier notifier) {
        mCM.setPhoneType(Phone.PHONE_TYPE_CDMA);
File
CDMAPhone.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method invocation
Chunk
Conflicting content 
    protected int cdmaDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
    protected int newCdmaDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
    protected int mRegistrationState = -1;
<<<<<<< HEAD
=======
    protected RegistrantList cdmaDataConnectionAttachedRegistrants = new RegistrantList();
    protected RegistrantList cdmaDataConnectionDetachedRegistrants = new RegistrantList();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    protected RegistrantList cdmaForSubscriptionInfoReadyRegistrants = new RegistrantList();

    /**
Solution content 
    protected int cdmaDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
    protected int newCdmaDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
    protected int mRegistrationState = -1;
    protected RegistrantList cdmaForSubscriptionInfoReadyRegistrants = new RegistrantList();

    /**
File
CdmaServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            newSS.setCssIndicator(cssIndicator);
            mCdmaRoaming =
                    regCodeIsRoaming(registrationState) && !isRoamIndForHomeSystem(states[10]);
            newSS.setState (regCodeToServiceState(registrationState));
<<<<<<< HEAD

            if(checkAdditionalDataAvaiable()) {
                this.newCdmaDataConnectionState =
                        radioTechnologyToDataServiceState(radioTechnology);
                newSS.setRadioTechnology(radioTechnology);
                newNetworkType = radioTechnology;
            }

            newSS.setSystemAndNetworkId(systemId, networkId);
            mRoamingIndicator = roamingIndicator;
            mIsInPrl = (systemIsInPrl == 0) ? false : true;
            mDefaultRoamingIndicator = defaultRoamingIndicator;

=======

            if(checkAdditionalDataAvaiable()) {
                this.newCdmaDataConnectionState =
                        radioTechnologyToDataServiceState(radioTechnology);
                newSS.setRadioTechnology(radioTechnology);
                newNetworkType = radioTechnology;
            }

            newSS.setCssIndicator(cssIndicator);
            newSS.setSystemAndNetworkId(systemId, networkId);
            mRoamingIndicator = roamingIndicator;
            mIsInPrl = (systemIsInPrl == 0) ? false : true;
            mDefaultRoamingIndicator = defaultRoamingIndicator;

>>>>>>> d79459670576da8aafc831ac0872f550d4137164

            // Values are -1 if not available.
            newCellLoc.setCellLocationData(baseStationId, baseStationLatitude,
Solution content 
            mCdmaRoaming =
                    regCodeIsRoaming(registrationState) && !isRoamIndForHomeSystem(states[10]);
            newSS.setState (regCodeToServiceState(registrationState));

            if(checkAdditionalDataAvaiable()) {
                this.newCdmaDataConnectionState =
                        radioTechnologyToDataServiceState(radioTechnology);
                newSS.setRadioTechnology(radioTechnology);
                newNetworkType = radioTechnology;
            }

            newSS.setCssIndicator(cssIndicator);
            newSS.setSystemAndNetworkId(systemId, networkId);
            mRoamingIndicator = roamingIndicator;
            mIsInPrl = (systemIsInPrl == 0) ? false : true;
            mDefaultRoamingIndicator = defaultRoamingIndicator;


            // Values are -1 if not available.
            newCellLoc.setCellLocationData(baseStationId, baseStationLatitude,
File
CdmaServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Variable
Chunk
Conflicting content 
    protected int mProfileId = RILConstants.DATA_PROFILE_DEFAULT;
    protected String mActiveApnType = Phone.APN_TYPE_DEFAULT;
    //***** Constructor
<<<<<<< HEAD
    private GsmDataConnection(PhoneBase phone, String name, int id, RetryManager rm) {
        super(phone, name, id, rm);
=======
    private GsmDataConnection(PhoneBase phone, String name, RetryManager rm) {
        super(phone, name, rm);
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    }

    /**
Solution content 
    protected int mProfileId = RILConstants.DATA_PROFILE_DEFAULT;
    protected String mActiveApnType = Phone.APN_TYPE_DEFAULT;
    //***** Constructor
    private GsmDataConnection(PhoneBase phone, String name, int id, RetryManager rm) {
        super(phone, name, id, rm);
    }

    /**
File
GsmDataConnection.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
            ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
            if (defaultApnContext.getState() == State.FAILED) {
                cleanUpConnection(false, defaultApnContext);
<<<<<<< HEAD
                defaultApnContext.getDataConnection().resetRetryCount();
=======
                mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
            }
            trySetupData(Phone.REASON_GPRS_ATTACHED, Phone.APN_TYPE_DEFAULT);
        }
Solution content 
            ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
            if (defaultApnContext.getState() == State.FAILED) {
                cleanUpConnection(false, defaultApnContext);
                defaultApnContext.getDataConnection().resetRetryCount();
            }
            trySetupData(Phone.REASON_GPRS_ATTACHED, Phone.APN_TYPE_DEFAULT);
        }
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        if (DBG)
            log("***trySetupData for type:" + type+" due to " + (reason == null ? "(unspecified)" : reason));
        log("[DSAC DEB] " + "trySetupData with mIsPsRestricted=" + mIsPsRestricted);
<<<<<<< HEAD

        if (type == null) {
            type = Phone.APN_TYPE_DEFAULT;
        }

=======

        if (type == null) {
            type = Phone.APN_TYPE_DEFAULT;
        }

>>>>>>> d79459670576da8aafc831ac0872f550d4137164
        ApnContext apnContext = mApnContexts.get(type);

        if (apnContext == null ){
Solution content 
        if (DBG)
            log("***trySetupData for type:" + type+" due to " + (reason == null ? "(unspecified)" : reason));
        log("[DSAC DEB] " + "trySetupData with mIsPsRestricted=" + mIsPsRestricted);

        if (type == null) {
            type = Phone.APN_TYPE_DEFAULT;
        }

        ApnContext apnContext = mApnContexts.get(type);

        if (apnContext == null ){
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
        if (dc == null) {
        if (DBG) log("enter setupData!");
        ApnSetting apn;
        GsmDataConnection dc;
<<<<<<< HEAD

        int profileId = getApnProfileID(apnContext.getApnType());
        apn = apnContext.getNextApn();
        if (apn == null) {
            if (DBG) log("setupData: return for no apn found!");
            return false;
        }

=======

        int profileId = getApnProfileID(apnContext.getApnType());
        apn = apnContext.getNextApn();
        if (apn == null) {
            if (DBG) log("setupData: return for no apn found!");
            return false;
        }

        if (((mPhone.getServiceState().getRadioTechnology() == ServiceState.RADIO_TECHNOLOGY_EHRPD)
            || (mPhone.getServiceState().getRadioTechnology() == ServiceState.RADIO_TECHNOLOGY_LTE))
            && (!apn.enabled)) {
            if (DBG) log("setupData: apn is desabled by carrier!");
            return false;
        }

>>>>>>> d79459670576da8aafc831ac0872f550d4137164
        dc = findReadyDataConnection(apn);
Solution content 
        if (DBG) log("enter setupData!");
        ApnSetting apn;
        GsmDataConnection dc;

        int profileId = getApnProfileID(apnContext.getApnType());
        apn = apnContext.getNextApn();
        if (apn == null) {
            if (DBG) log("setupData: return for no apn found!");
            return false;
        }

        dc = findReadyDataConnection(apn);

        if (dc == null) {
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        cleanUpAllConnections(isConnected, Phone.REASON_APN_CHANGED);
        if (!isConnected) {
            // TODO: Won't work for multiple connections!!!!
<<<<<<< HEAD
            defaultApnContext.getDataConnection().resetRetryCount();
=======
            mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
            defaultApnContext.setReason(Phone.REASON_APN_CHANGED);
            trySetupData(defaultApnContext);
        }
Solution content 
        cleanUpAllConnections(isConnected, Phone.REASON_APN_CHANGED);
        if (!isConnected) {
            // TODO: Won't work for multiple connections!!!!
            defaultApnContext.getDataConnection().resetRetryCount();
            defaultApnContext.setReason(Phone.REASON_APN_CHANGED);
            trySetupData(defaultApnContext);
        }
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
        startNetStatPoll();
        // reset reconnect timer
<<<<<<< HEAD
        apnContext.getDataConnection().resetRetryCount();
=======
        mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    }

    // TODO: For multiple Active APNs not exactly sure how to do this.
Solution content 
        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
        startNetStatPoll();
        // reset reconnect timer
        apnContext.getDataConnection().resetRetryCount();
    }

    // TODO: For multiple Active APNs not exactly sure how to do this.
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            return;
        }
        if (apnContext.getState() == State.FAILED) {
<<<<<<< HEAD
            if (!apnContext.getDataConnection().isRetryNeeded()) {
=======
            if (!mRetryMgr.isRetryNeeded()) {
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
                if (!apnContext.getApnType().equals(Phone.APN_TYPE_DEFAULT)){
                    // if no more retries on a secondary APN attempt, tell the world and revert.
                    notifyDataConnection(Phone.REASON_APN_FAILED);
Solution content 
            return;
        }
        if (apnContext.getState() == State.FAILED) {
            if (!apnContext.getDataConnection().isRetryNeeded()) {
                if (!apnContext.getApnType().equals(Phone.APN_TYPE_DEFAULT)){
                    // if no more retries on a secondary APN attempt, tell the world and revert.
                    notifyDataConnection(Phone.REASON_APN_FAILED);
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
                }
                if (mReregisterOnReconnectFailure) {
                    // We've re-registerd once now just retry forever.
<<<<<<< HEAD
                    apnContext.getDataConnection().retryForeverUsingLastTimeout();
=======
                    mRetryMgr.retryForeverUsingLastTimeout();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
                } else {
                    // Try to Re-register to the network.
                    log("PDP activate failed, Reregistering to the network");
Solution content 
                }
                if (mReregisterOnReconnectFailure) {
                    // We've re-registerd once now just retry forever.
                    apnContext.getDataConnection().retryForeverUsingLastTimeout();
                } else {
                    // Try to Re-register to the network.
                    log("PDP activate failed, Reregistering to the network");
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    log("PDP activate failed, Reregistering to the network");
                    mReregisterOnReconnectFailure = true;
                    mPhone.getServiceStateTracker().reRegisterNetwork(null);
<<<<<<< HEAD
                    apnContext.getDataConnection().resetRetryCount();
=======
                    mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
                    return;
                }
            }
Solution content 
                    log("PDP activate failed, Reregistering to the network");
                    mReregisterOnReconnectFailure = true;
                    mPhone.getServiceStateTracker().reRegisterNetwork(null);
                    apnContext.getDataConnection().resetRetryCount();
                    return;
                }
            }
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        if (apnContext.getApnType().equals(Phone.APN_TYPE_DEFAULT)) {
            log("onEnableNewApn default type");
            ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
<<<<<<< HEAD
            defaultApnContext.getDataConnection().resetRetryCount();
=======
            mRetryMgr = defaultApnContext.getDataConnection().getRetryMgr();
            mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
        } else if (mApnToDataConnectionId.get(apnContext.getApnType()) == null) {
            log("onEnableNewApn ApnType=" + apnContext.getApnType() +
                    " missing, make a new connection");
Solution content 
        if (apnContext.getApnType().equals(Phone.APN_TYPE_DEFAULT)) {
            log("onEnableNewApn default type");
            ApnContext defaultApnContext = mApnContexts.get(Phone.APN_TYPE_DEFAULT);
            defaultApnContext.getDataConnection().resetRetryCount();
        } else if (mApnToDataConnectionId.get(apnContext.getApnType()) == null) {
            log("onEnableNewApn ApnType=" + apnContext.getApnType() +
                    " missing, make a new connection");
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            log("onEnableNewApn ApnType=" + apnContext.getApnType() +
                    " missing, make a new connection");
            int id = createDataConnection(apnContext.getApnType());
<<<<<<< HEAD
            mDataConnections.get(id).resetRetryCount();
=======
            mRetryMgr = mDataConnections.get(id).getRetryMgr();
            mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
        } else {
            log("oneEnableNewApn connection already exists, nothing to setup");
        }
Solution content 
        }
            log("onEnableNewApn ApnType=" + apnContext.getApnType() +
                    " missing, make a new connection");
            int id = createDataConnection(apnContext.getApnType());
            mDataConnections.get(id).resetRetryCount();
        } else {
            log("oneEnableNewApn connection already exists, nothing to setup");
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            mReregisterOnReconnectFailure = false;
            // in case data setup was attempted when we were on a voice call
            trySetupData(Phone.REASON_VOICE_CALL_ENDED, Phone.APN_TYPE_DEFAULT);
<<<<<<< HEAD
        }
    }

    @Override
    protected void onCleanUpConnection(boolean tearDown, int apnId, String reason) {
        if (DBG) log("onCleanUpConnection");
        ApnContext apnContext = mApnContexts.get(apnIdToType(apnId));
        cleanUpConnection(tearDown, apnContext);
    }

    protected boolean isConnected() {
        Iterator it = mApnContexts.values().iterator();
         while (it.hasNext()) {
            ApnContext apnContext = it.next();
            if (apnContext.getState() == State.CONNECTED) {
            return true;
            }
=======
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
        }
        return false;
    }
Solution content 
            mReregisterOnReconnectFailure = false;
            // in case data setup was attempted when we were on a voice call
            trySetupData(Phone.REASON_VOICE_CALL_ENDED, Phone.APN_TYPE_DEFAULT);
        }
    }
File
GsmDataConnectionTracker.java
Developer's decision
Version 2
Kind of conflict
Annotation
If statement
Method declaration
Method invocation
Method signature
Variable
While statement
Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
=======
    protected void onCleanUpConnection(boolean tearDown, int apnId, String reason) {
        if (DBG) log("onCleanUpConnection");
        ApnContext apnContext = mApnContexts.get(apnIdToType(apnId));
        cleanUpConnection(tearDown, apnContext);
    }

    protected boolean isConnected() {
        Iterator it = mApnContexts.values().iterator();
         while (it.hasNext()) {
            ApnContext apnContext = it.next();
            if (apnContext.getState() == State.CONNECTED) {
            return true;
            }
        }
        return false;
    }

    @Override
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    protected void notifyDataConnection(String reason) {
        if (DBG) log("notify all enabled connection for:" + reason);
        Iterator it = mApnContexts.values().iterator();
Solution content 
    }

    @Override
    protected void onCleanUpConnection(boolean tearDown, int apnId, String reason) {
        if (DBG) log("onCleanUpConnection");
        ApnContext apnContext = mApnContexts.get(apnIdToType(apnId));
        cleanUpConnection(tearDown, apnContext);
    }

    protected boolean isConnected() {
        Iterator it = mApnContexts.values().iterator();
         while (it.hasNext()) {
            ApnContext apnContext = it.next();
            if (apnContext.getState() == State.CONNECTED) {
            return true;
            }
        }
        return false;
    }

    @Override
    protected void notifyDataConnection(String reason) {
        if (DBG) log("notify all enabled connection for:" + reason);
        Iterator it = mApnContexts.values().iterator();
File
GsmDataConnectionTracker.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
                    // TODO: Should all PDN states be checked to fail?
                    if (mState == State.FAILED) {
                        cleanUpAllConnections(false, Phone.REASON_PS_RESTRICT_ENABLED);
<<<<<<< HEAD
                        resetAllRetryCounts();
=======
                        mRetryMgr.resetRetryCount();
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
                        mReregisterOnReconnectFailure = false;
                    }
                    trySetupData(Phone.REASON_PS_RESTRICT_ENABLED, Phone.APN_TYPE_DEFAULT);
Solution content 
                    // TODO: Should all PDN states be checked to fail?
                    if (mState == State.FAILED) {
                        cleanUpAllConnections(false, Phone.REASON_PS_RESTRICT_ENABLED);
                        resetAllRetryCounts();
                        mReregisterOnReconnectFailure = false;
                    }
                    trySetupData(Phone.REASON_PS_RESTRICT_ENABLED, Phone.APN_TYPE_DEFAULT);
File
GsmDataConnectionTracker.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        gprsDetachedRegistrants.add(r);

        return phone;
    }

<<<<<<< HEAD
=======
    /**
     * Registration point for transition into GPRS attached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    @Override
    public void registerForDataConnectionAttached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        gprsAttachedRegistrants.add(r);

        if (gprsState == ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }

    @Override
    public void unregisterForDataConnectionAttached(Handler h) {
        gprsAttachedRegistrants.remove(h);
    }

    void registerForNetworkAttach(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        networkAttachedRegistrants.add(r);

        if (ss.getState() == ServiceState.STATE_IN_SERVICE) {
            r.notifyRegistrant();
        }
    }

    void unregisterForNetworkAttach(Handler h) {
        networkAttachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into GPRS detached.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    void registerForGprsDetached(Handler h, int what, Object obj) {
        Registrant r = new Registrant(h, what, obj);
        if (gprsState == ServiceState.STATE_OUT_OF_SERVICE) {
            r.notifyRegistrant();
        }
    }

    void unregisterForGprsDetached(Handler h) {
        gprsDetachedRegistrants.remove(h);
    }

    /**
     * Registration point for transition into packet service restricted zone.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForPsRestrictedEnabled(Handler h, int what, Object obj) {
        Log.d(LOG_TAG, "[DSAC DEB] " + "registerForPsRestrictedEnabled ");
        Registrant r = new Registrant(h, what, obj);
        psRestrictEnabledRegistrants.add(r);

        if (rs.isPsRestricted()) {
            r.notifyRegistrant();
        }
    }

    public void unregisterForPsRestrictedEnabled(Handler h) {
        psRestrictEnabledRegistrants.remove(h);
    }

    /**
     * Registration point for transition out of packet service restricted zone.
     * @param h handler to notify
     * @param what what code of message when delivered
     * @param obj placed in Message.obj
     */
    public void registerForPsRestrictedDisabled(Handler h, int what, Object obj) {
        Log.d(LOG_TAG, "[DSAC DEB] " + "registerForPsRestrictedDisabled ");
        Registrant r = new Registrant(h, what, obj);
        psRestrictDisabledRegistrants.add(r);

        if (rs.isPsRestricted()) {
            r.notifyRegistrant();
        }
    }

    public void unregisterForPsRestrictedDisabled(Handler h) {
        psRestrictDisabledRegistrants.remove(h);
    }

>>>>>>> d79459670576da8aafc831ac0872f550d4137164
    public void handleMessage (Message msg) {
        AsyncResult ar;
        int[] ints;
Solution content 
        return phone;
    }

    public void handleMessage (Message msg) {
        AsyncResult ar;
        int[] ints;
File
GsmServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
import com.android.internal.telephony.IccCard;
import com.android.internal.telephony.PhoneBase;
<<<<<<< HEAD
import com.android.internal.telephony.TelephonyProperties;
=======
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
import android.os.SystemProperties;

/**
Solution content 
import com.android.internal.telephony.IccCard;
import com.android.internal.telephony.PhoneBase;
import com.android.internal.telephony.TelephonyProperties;
import android.os.SystemProperties;

/**
File
SimCard.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        mPhone.mCM.registerForSIMReady(mHandler, EVENT_ICC_READY, null);
        updateStateProperty();

<<<<<<< HEAD
        if(SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false)) {
=======
        if(SystemProperties.getBoolean("ro.mot.lte_on_cdma", false)) {
>>>>>>> d79459670576da8aafc831ac0872f550d4137164
            mPhone.mCM.registerForNVReady(mHandler, EVENT_ICC_READY, null);
        }
    }
Solution content 
        mPhone.mCM.registerForSIMReady(mHandler, EVENT_ICC_READY, null);
        updateStateProperty();

        if(SystemProperties.getBoolean(TelephonyProperties.PROPERTY_NETWORK_LTE_ON_CDMA, false)) {
            mPhone.mCM.registerForNVReady(mHandler, EVENT_ICC_READY, null);
        }
    }
File
SimCard.java
Developer's decision
Version 1
Kind of conflict
If statement