Projects >> packages_apps_Phone >>5f5375e35371cbe909c58e18f7b45c159f9f3854

Chunk
Conflicting content 
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.ProgressDialog;
<<<<<<< HEAD
import android.app.VibrationPickerDialog;
=======
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
Solution content 
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.ProgressDialog;
import android.app.VibrationPickerDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
File
CallFeaturesSetting.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private static final String BUTTON_TTY_KEY         = "button_tty_mode_key";
    /* package */ static final String BUTTON_RING_DELAY_KEY = "button_ring_delay_key";
    private static final String BUTTON_HAC_KEY         = "button_hac_key";
<<<<<<< HEAD
    private static final String BUTTON_NOISE_SUPPRESSION_KEY = "button_noise_suppression_key";
=======
    private static final String BUTTON_DIALPAD_AUTOCOMPLETE = "button_dialpad_autocomplete";
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d

    private static final String BUTTON_GSM_UMTS_OPTIONS = "button_gsm_more_expand_key";
    private static final String BUTTON_CDMA_OPTIONS = "button_cdma_more_expand_key";
Solution content 
    private static final String BUTTON_TTY_KEY         = "button_tty_mode_key";
    /* package */ static final String BUTTON_RING_DELAY_KEY = "button_ring_delay_key";
    private static final String BUTTON_HAC_KEY         = "button_hac_key";
    private static final String BUTTON_NOISE_SUPPRESSION_KEY = "button_noise_suppression_key";
    private static final String BUTTON_DIALPAD_AUTOCOMPLETE = "button_dialpad_autocomplete";

    private static final String BUTTON_GSM_UMTS_OPTIONS = "button_gsm_more_expand_key";
    private static final String BUTTON_CDMA_OPTIONS = "button_cdma_more_expand_key";
File
CallFeaturesSetting.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
        } else if (preference == mPlayDtmfTone) {
            Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
                    mPlayDtmfTone.isChecked() ? 1 : 0);
<<<<<<< HEAD
        } else if (preference == mMwiNotification) {
            int mwi_notification = mMwiNotification.isChecked() ? 1 : 0;
            Settings.System.putInt(mPhone.getContext().getContentResolver(),
                    Settings.System.ENABLE_MWI_NOTIFICATION, mwi_notification);
            return true;
=======
        } else if (preference == mDialpadAutocomplete) {
            Settings.Secure.putInt(getContentResolver(), Settings.Secure.DIALPAD_AUTOCOMPLETE,
                    mDialpadAutocomplete.isChecked() ? 1 : 0);
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
        } else if (preference == mButtonDTMF) {
            return true;
        } else if (preference == mButtonTTY) {
Solution content 
        } else if (preference == mPlayDtmfTone) {
            Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
                    mPlayDtmfTone.isChecked() ? 1 : 0);
        } else if (preference == mMwiNotification) {
            int mwi_notification = mMwiNotification.isChecked() ? 1 : 0;
            Settings.System.putInt(mPhone.getContext().getContentResolver(),
                    Settings.System.ENABLE_MWI_NOTIFICATION, mwi_notification);
            return true;
        } else if (preference == mDialpadAutocomplete) {
            Settings.Secure.putInt(getContentResolver(), Settings.Secure.DIALPAD_AUTOCOMPLETE,
                    mDialpadAutocomplete.isChecked() ? 1 : 0);
        } else if (preference == mButtonDTMF) {
            return true;
        } else if (preference == mButtonTTY) {
File
CallFeaturesSetting.java
Developer's decision
Concatenation
Kind of conflict
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
        mVibrationPreference = findPreference(BUTTON_VIBRATION_KEY);
        mVibrateWhenRinging = (CheckBoxPreference) findPreference(BUTTON_VIBRATE_ON_RING);
        mPlayDtmfTone = (CheckBoxPreference) findPreference(BUTTON_PLAY_DTMF_TONE);
<<<<<<< HEAD
        mMwiNotification = (CheckBoxPreference) findPreference(BUTTON_MWI_NOTIFICATION_KEY);
        if (mMwiNotification != null) {
            if (getResources().getBoolean(R.bool.sprint_mwi_quirk)) {
                mMwiNotification.setOnPreferenceChangeListener(this);
            } else {
                PreferenceScreen voicemailScreen = (PreferenceScreen) findPreference(BUTTON_VOICEMAIL_CATEGORY_KEY);
                voicemailScreen.removePreference(mMwiNotification);
                mMwiNotification = null;
            }
        }

=======
        mDialpadAutocomplete = (CheckBoxPreference) findPreference(BUTTON_DIALPAD_AUTOCOMPLETE);
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
        mButtonDTMF = (ListPreference) findPreference(BUTTON_DTMF_KEY);
        mButtonAutoRetry = (CheckBoxPreference) findPreference(BUTTON_RETRY_KEY);
        mButtonHAC = (CheckBoxPreference) findPreference(BUTTON_HAC_KEY);
Solution content 
        mVibrationPreference = findPreference(BUTTON_VIBRATION_KEY);
        mVibrateWhenRinging = (CheckBoxPreference) findPreference(BUTTON_VIBRATE_ON_RING);
        mPlayDtmfTone = (CheckBoxPreference) findPreference(BUTTON_PLAY_DTMF_TONE);
        mMwiNotification = (CheckBoxPreference) findPreference(BUTTON_MWI_NOTIFICATION_KEY);
        if (mMwiNotification != null) {
            if (getResources().getBoolean(R.bool.sprint_mwi_quirk)) {
                mMwiNotification.setOnPreferenceChangeListener(this);
            } else {
                PreferenceScreen voicemailScreen = (PreferenceScreen) findPreference(BUTTON_VOICEMAIL_CATEGORY_KEY);
                voicemailScreen.removePreference(mMwiNotification);
                mMwiNotification = null;
            }
        }

        mDialpadAutocomplete = (CheckBoxPreference) findPreference(BUTTON_DIALPAD_AUTOCOMPLETE);
        mButtonDTMF = (ListPreference) findPreference(BUTTON_DTMF_KEY);
        mButtonAutoRetry = (CheckBoxPreference) findPreference(BUTTON_RETRY_KEY);
        mButtonHAC = (CheckBoxPreference) findPreference(BUTTON_HAC_KEY);
File
CallFeaturesSetting.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Cast expression
If statement
Chunk
Conflicting content 
        mCM.unregisterForRingbackTone(this);
        mCM.unregisterForResendIncallMute(this);

<<<<<<< HEAD
        // Release the ToneGenerator used for playing SignalInfo and CallWaiting
        if (mSignalInfoToneGenerator != null) {
            mSignalInfoToneGenerator.release();
            mSignalInfoToneGenerator = null;
        }

=======
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
        // Clear ringback tone player
        mInCallRingbackTonePlayer = null;
Solution content 
        mCM.unregisterForRingbackTone(this);
        mCM.unregisterForResendIncallMute(this);

        // Release the ToneGenerator used for playing SignalInfo and CallWaiting
        if (mSignalInfoToneGenerator != null) {
            mSignalInfoToneGenerator.release();
            mSignalInfoToneGenerator = null;
        }

        // Clear ringback tone player
        mInCallRingbackTonePlayer = null;
File
CallNotifier.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Chunk
Conflicting content 
                    android.provider.Settings.Global.PREFERRED_NETWORK_MODE, preferredNetworkMode);
            if (buttonNetworkMode != settingsNetworkMode) {
                int modemNetworkMode;
<<<<<<< HEAD
                switch(buttonNetworkMode) {
                    case Phone.NT_MODE_LTE_WCDMA:
                        modemNetworkMode = Phone.NT_MODE_LTE_WCDMA;
                        break;
                    case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
                        modemNetworkMode = Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA;
                        break;
                    case Phone.NT_MODE_LTE_GSM_WCDMA:
                        modemNetworkMode = Phone.NT_MODE_LTE_GSM_WCDMA;
                        break;
                    case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
                        modemNetworkMode = Phone.NT_MODE_LTE_CDMA_AND_EVDO;
                        break;
                    case Phone.NT_MODE_GLOBAL:
                        modemNetworkMode = Phone.NT_MODE_GLOBAL;
                        break;
                    case Phone.NT_MODE_EVDO_NO_CDMA:
                        modemNetworkMode = Phone.NT_MODE_EVDO_NO_CDMA;
                        break;
                    case Phone.NT_MODE_CDMA_NO_EVDO:
                        modemNetworkMode = Phone.NT_MODE_CDMA_NO_EVDO;
                        break;
                    case Phone.NT_MODE_CDMA:
                        modemNetworkMode = Phone.NT_MODE_CDMA;
                        break;
                    case Phone.NT_MODE_GSM_UMTS:
                        modemNetworkMode = Phone.NT_MODE_GSM_UMTS;
                        break;
                    case Phone.NT_MODE_WCDMA_ONLY:
                        modemNetworkMode = Phone.NT_MODE_WCDMA_ONLY;
                        break;
                    case Phone.NT_MODE_GSM_ONLY:
                        modemNetworkMode = Phone.NT_MODE_GSM_ONLY;
                        break;
=======
                // if new mode is invalid ignore it
                switch (buttonNetworkMode) {
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
                    case Phone.NT_MODE_WCDMA_PREF:
                    case Phone.NT_MODE_GSM_ONLY:
                    case Phone.NT_MODE_WCDMA_ONLY:
Solution content 
                    android.provider.Settings.Global.PREFERRED_NETWORK_MODE, preferredNetworkMode);
            if (buttonNetworkMode != settingsNetworkMode) {
                int modemNetworkMode;
                switch(buttonNetworkMode) {
                    case Phone.NT_MODE_LTE_WCDMA:
                        modemNetworkMode = Phone.NT_MODE_LTE_WCDMA;
                        break;
                    case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
                        modemNetworkMode = Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA;
                        break;
                    case Phone.NT_MODE_LTE_GSM_WCDMA:
                        modemNetworkMode = Phone.NT_MODE_LTE_GSM_WCDMA;
                        break;
                    case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
                        modemNetworkMode = Phone.NT_MODE_LTE_CDMA_AND_EVDO;
                        break;
                    case Phone.NT_MODE_GLOBAL:
                        modemNetworkMode = Phone.NT_MODE_GLOBAL;
                        break;
                    case Phone.NT_MODE_EVDO_NO_CDMA:
                        modemNetworkMode = Phone.NT_MODE_EVDO_NO_CDMA;
                        break;
                    case Phone.NT_MODE_CDMA_NO_EVDO:
                        modemNetworkMode = Phone.NT_MODE_CDMA_NO_EVDO;
                        break;
                    case Phone.NT_MODE_CDMA:
                        modemNetworkMode = Phone.NT_MODE_CDMA;
                        break;
                    case Phone.NT_MODE_GSM_UMTS:
                        modemNetworkMode = Phone.NT_MODE_GSM_UMTS;
                        break;
                    case Phone.NT_MODE_WCDMA_ONLY:
                        modemNetworkMode = Phone.NT_MODE_WCDMA_ONLY;
                        break;
                    case Phone.NT_MODE_GSM_ONLY:
                        modemNetworkMode = Phone.NT_MODE_GSM_ONLY;
                        break;
                    case Phone.NT_MODE_WCDMA_PREF:
                    case Phone.NT_MODE_GSM_ONLY:
                    case Phone.NT_MODE_WCDMA_ONLY:
File
MobileNetworkSettings.java
Developer's decision
Version 1
Kind of conflict
Break statement
Case statement
Comment
Switch statement
Variable
Chunk
Conflicting content 
                        modemNetworkMode == Phone.NT_MODE_CDMA ||
                        modemNetworkMode == Phone.NT_MODE_CDMA_NO_EVDO ||
                        modemNetworkMode == Phone.NT_MODE_EVDO_NO_CDMA ||
<<<<<<< HEAD
                        //A modem might report world phone sometimes
                        //but it's not true. Double check here
                        ((getResources().getBoolean(R.bool.world_phone) == true || isLteOnCdma) &&
                            modemNetworkMode == Phone.NT_MODE_GLOBAL) ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CDMA_AND_EVDO ||
                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_WCDMA ) {
=======
                        modemNetworkMode == Phone.NT_MODE_GLOBAL ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CDMA_AND_EVDO ||
                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_ONLY ||
                        modemNetworkMode == Phone.NT_MODE_LTE_WCDMA) {
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
                    if (DBG) {
                        log("handleGetPreferredNetworkTypeResponse: if 1: modemNetworkMode = " +
                                modemNetworkMode);
Solution content 
                        modemNetworkMode == Phone.NT_MODE_CDMA ||
                        modemNetworkMode == Phone.NT_MODE_CDMA_NO_EVDO ||
                        modemNetworkMode == Phone.NT_MODE_EVDO_NO_CDMA ||
                        //A modem might report world phone sometimes
                        //but it's not true. Double check here
                        ((getResources().getBoolean(R.bool.world_phone) == true || isLteOnCdma) &&
                            modemNetworkMode == Phone.NT_MODE_GLOBAL) ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CDMA_AND_EVDO ||
                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_WCDMA ) {
                        modemNetworkMode == Phone.NT_MODE_GLOBAL ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CDMA_AND_EVDO ||
                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA ||
                        modemNetworkMode == Phone.NT_MODE_LTE_ONLY ||
                        modemNetworkMode == Phone.NT_MODE_LTE_WCDMA) {
                    if (DBG) {
                        log("handleGetPreferredNetworkTypeResponse: if 1: modemNetworkMode = " +
                                modemNetworkMode);
File
MobileNetworkSettings.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                    UpdatePreferredNetworkModeSummary(modemNetworkMode);
                    // changes the mButtonPreferredNetworkMode accordingly to modemNetworkMode
                    mButtonPreferredNetworkMode.setValue(Integer.toString(modemNetworkMode));
<<<<<<< HEAD

                    Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
                    intent.putExtra(PhoneToggler.NETWORK_MODE, modemNetworkMode);
                    mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
                } else if (modemNetworkMode == Phone.NT_MODE_LTE_ONLY) {
                    // LTE Only mode not yet supported on UI, but could be used for testing
                    if (DBG) log("handleGetPreferredNetworkTypeResponse: lte only: no action");
=======
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
                } else {
                    if (DBG) log("handleGetPreferredNetworkTypeResponse: else: reset to default");
                    resetNetworkModeToDefault();
Solution content 
                    UpdatePreferredNetworkModeSummary(modemNetworkMode);
                    // changes the mButtonPreferredNetworkMode accordingly to modemNetworkMode
                    mButtonPreferredNetworkMode.setValue(Integer.toString(modemNetworkMode));

                    Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
                    intent.putExtra(PhoneToggler.NETWORK_MODE, modemNetworkMode);
                    mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
                } else if (modemNetworkMode == Phone.NT_MODE_LTE_ONLY) {
                    // LTE Only mode not yet supported on UI, but could be used for testing
                    if (DBG) log("handleGetPreferredNetworkTypeResponse: lte only: no action");
                } else {
                    if (DBG) log("handleGetPreferredNetworkTypeResponse: else: reset to default");
                    resetNetworkModeToDefault();
File
MobileNetworkSettings.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
                break;
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_evdo_only_summary);
                break;
<<<<<<< HEAD
            case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_cdma_evdo_summary);
                break;
            case Phone.NT_MODE_LTE_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_gsm_summary);
                break;
            case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_LTE_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_wcdma_summary);
=======
            case Phone.NT_MODE_LTE_ONLY:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_summary);
            case Phone.NT_MODE_LTE_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_cdma_evdo_summary);
                break;
            case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_global_summary);
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
                break;
            case Phone.NT_MODE_GLOBAL:
                mButtonPreferredNetworkMode.setSummary(
Solution content 
                break;
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_evdo_only_summary);
                break;
            case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_cdma_evdo_summary);
                break;
            case Phone.NT_MODE_LTE_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_gsm_summary);
            case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_LTE_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_wcdma_summary);
            case Phone.NT_MODE_LTE_ONLY:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_summary);
                break;
            case Phone.NT_MODE_LTE_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_cdma_evdo_summary);
                break;
            case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_global_summary);
                break;
            case Phone.NT_MODE_GLOBAL:
                mButtonPreferredNetworkMode.setSummary(
File
MobileNetworkSettings.java
Developer's decision
Concatenation
Kind of conflict
Break statement
Case statement
Method invocation
Chunk
Conflicting content 
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyCapabilities;

<<<<<<< HEAD
import java.util.ArrayList;

=======
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
/**
 * NotificationManager-related utility code for the Phone app.
 *
Solution content 
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyCapabilities;

import java.util.ArrayList;

/**
 * NotificationManager-related utility code for the Phone app.
 *
File
NotificationMgr.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    protected void  onClick() {
        super.onClick();

<<<<<<< HEAD
        int bestAvailableType = (mPhone.getLteOnGsmMode() == 0) ?
                                Phone.NT_MODE_WCDMA_PREF : Phone.NT_MODE_LTE_GSM_WCDMA;
        int networkType = isChecked() ? Phone.NT_MODE_GSM_ONLY : bestAvailableType;

=======
        int networkType = isChecked() ? Phone.NT_MODE_GSM_ONLY : getDefaultNetworkMode();
>>>>>>> 720e662fcc384a85333f73ff23141b5c5c31446d
        Log.i(LOG_TAG, "set preferred network type="+networkType);
        android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
                android.provider.Settings.Global.PREFERRED_NETWORK_MODE, networkType);
Solution content 
    protected void  onClick() {
        super.onClick();
        int networkType = isChecked() ? Phone.NT_MODE_GSM_ONLY : getDefaultNetworkMode();
        Log.i(LOG_TAG, "set preferred network type="+networkType);
        android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
                android.provider.Settings.Global.PREFERRED_NETWORK_MODE, networkType);
File
Use2GOnlyCheckBoxPreference.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable