Projects >> packages_apps_Phone >>cea99b34e18eca0985dd337f575aa0600b7c256d

Chunk
Conflicting content 
import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
import com.android.internal.telephony.cdma.SignalToneUtil;
<<<<<<< HEAD
import com.android.internal.telephony.CallManager;
import com.android.phone.CallFeaturesSetting;
=======
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
import com.android.internal.telephony.gsm.SuppServiceNotification;

import android.app.ActivityManagerNative;
Solution content 
import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
import com.android.internal.telephony.cdma.SignalToneUtil;
import com.android.internal.telephony.CallManager;
import com.android.phone.CallFeaturesSetting;
import com.android.internal.telephony.gsm.SuppServiceNotification;

import android.app.ActivityManagerNative;
File
CallNotifier.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                setInCallScreenMode(InCallScreenMode.MANAGE_CONFERENCE);
                requestUpdateScreen();
                break;
<<<<<<< HEAD
            case R.id.addBlacklistButton:
                confirmAddBlacklist();
=======
            case R.id.addParticipant:
                onAddParticipant();
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
                break;

            default:
Solution content 
                setInCallScreenMode(InCallScreenMode.MANAGE_CONFERENCE);
                requestUpdateScreen();
                break;
            case R.id.addBlacklistButton:
                confirmAddBlacklist();
                break;
            case R.id.addParticipant:
                onAddParticipant();
                break;

            default:
File
InCallScreen.java
Developer's decision
Concatenation
Kind of conflict
Case statement
Method invocation
Chunk
Conflicting content 
        Log.d(LOG_TAG, msg);
    }

<<<<<<< HEAD
    protected void updateSettings() {
       SharedPreferences callsettings = PreferenceManager.getDefaultSharedPreferences(this);

       Exit_To_Home_Screen = (callsettings.getBoolean(BUTTON_EXIT_TO_HOMESCREEN_KEY,false));
       Enable_Landscape_In_Call = callsettings.getBoolean(BUTTON_LANDSCAPE_KEY,false);

      }
=======
    private void loge(String msg) {
        Log.e(LOG_TAG, msg);
    }
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379

    /**
     * Requests to remove provider info frame after having
Solution content 
        Log.d(LOG_TAG, msg);
    }

    private void loge(String msg) {
        Log.e(LOG_TAG, msg);
    }

    protected void updateSettings() {
       SharedPreferences callsettings = PreferenceManager.getDefaultSharedPreferences(this);

       Exit_To_Home_Screen = (callsettings.getBoolean(BUTTON_EXIT_TO_HOMESCREEN_KEY,false));
       Enable_Landscape_In_Call = callsettings.getBoolean(BUTTON_LANDSCAPE_KEY,false);

      }

    /**
     * Requests to remove provider info frame after having
File
InCallScreen.java
Developer's decision
Concatenation
Kind of conflict
Method declaration
Chunk
Conflicting content 
    private ImageButton mSwapButton;
    private ImageButton mAddBlacklistButton;
    private View mHoldSwapSpacer;
<<<<<<< HEAD
    private View mBlacklistSpacer;
=======
    private Button mAddParticipant;
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379

    // "Extra button row"
    private ViewStub mExtraButtonRow;
Solution content 
    private ImageButton mSwapButton;
    private ImageButton mAddBlacklistButton;
    private View mHoldSwapSpacer;
    private View mBlacklistSpacer;

    // "Extra button row"
    private ViewStub mExtraButtonRow;
File
InCallTouchUi.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        mSwapButton.setOnClickListener(this);
        mSwapButton.setOnLongClickListener(this);
        mHoldSwapSpacer = mInCallControls.findViewById(R.id.holdSwapSpacer);
<<<<<<< HEAD
        mBlacklistSpacer = mInCallControls.findViewById(R.id.blacklistSpacer);

        // Blacklist functionality
        mAddBlacklistButton = (ImageButton) mInCallControls.findViewById(R.id.addBlacklistButton);
        if (mAddBlacklistButton != null) {
            mAddBlacklistButton.setOnClickListener(this);
=======
        mAddParticipant = (Button) mInCallControls.findViewById(R.id.addParticipant);
        if (mAddParticipant != null) {
            mAddParticipant.setVisibility(View.GONE);
            if (PhoneUtils.shouldShowAddParticipant()) {
                mAddParticipant.setOnClickListener(this);
                mAddParticipant.setOnLongClickListener(this);
            }
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
        }

        // TODO: Back when these buttons had text labels, we changed
Solution content 
            }
        mSwapButton.setOnClickListener(this);
        mSwapButton.setOnLongClickListener(this);
        mHoldSwapSpacer = mInCallControls.findViewById(R.id.holdSwapSpacer);
        mBlacklistSpacer = mInCallControls.findViewById(R.id.blacklistSpacer);

        // Blacklist functionality
        mAddBlacklistButton = (ImageButton) mInCallControls.findViewById(R.id.addBlacklistButton);
        if (mAddBlacklistButton != null) {
            mAddBlacklistButton.setOnClickListener(this);
        }
        mAddParticipant = (Button) mInCallControls.findViewById(R.id.addParticipant);
        if (mAddParticipant != null) {
            mAddParticipant.setVisibility(View.GONE);
            if (PhoneUtils.shouldShowAddParticipant()) {
                mAddParticipant.setOnClickListener(this);
                mAddParticipant.setOnLongClickListener(this);
        }

        // TODO: Back when these buttons had text labels, we changed
File
InCallTouchUi.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Cast expression
Comment
If statement
Method invocation
Chunk
Conflicting content 
            case R.id.swapButton:
            case R.id.cdmaMergeButton:
            case R.id.manageConferenceButton:
<<<<<<< HEAD
            case R.id.addBlacklistButton:
=======
            case R.id.addParticipant:
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
                // Clicks on the regular onscreen buttons get forwarded
                // straight to the InCallScreen.
                mInCallScreen.handleOnscreenButtonClick(id);
Solution content 
            case R.id.swapButton:
            case R.id.cdmaMergeButton:
            case R.id.manageConferenceButton:
            case R.id.addParticipant:
            case R.id.addBlacklistButton:
                // Clicks on the regular onscreen buttons get forwarded
                // straight to the InCallScreen.
                mInCallScreen.handleOnscreenButtonClick(id);
File
InCallTouchUi.java
Developer's decision
Concatenation
Kind of conflict
Case statement
Chunk
Conflicting content 
            }
                android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE,
                        networkMode );
<<<<<<< HEAD

                Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
                intent.putExtra(PhoneToggler.NETWORK_MODE, networkMode);
                mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
=======
                //Update '2GOnly checkbox' based on recent preferred network type selection.
                Use2GOnlyCheckBoxPreference.updateCheckBox(mPhone);
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
            } else {
                mPhone.getPreferredNetworkType(obtainMessage(MESSAGE_GET_PREFERRED_NETWORK_TYPE));
Solution content 
                android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE,
                        networkMode );

                Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
                intent.putExtra(PhoneToggler.NETWORK_MODE, networkMode);
                mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
                //Update '2GOnly checkbox' based on recent preferred network type selection.
                Use2GOnlyCheckBoxPreference.updateCheckBox(mPhone);
            } else {
                mPhone.getPreferredNetworkType(obtainMessage(MESSAGE_GET_PREFERRED_NETWORK_TYPE));
            }
File
MobileNetworkSettings.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_wcdma_summary);
                break;
<<<<<<< HEAD
            case Phone.NT_MODE_LTE_ONLY:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_summary);
=======
            case Phone.NT_MODE_TD_SCDMA_ONLY:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_only_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_WCDMA_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_wcdma_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM_WCDMA_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_wcdma_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_CDMA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_cdma_evdo_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_LTE_CDMA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_lte_cdma_evdo_gsm_wcdma_summary);
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
                break;
            default:
                mButtonPreferredNetworkMode.setSummary(
Solution content 
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_lte_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_ONLY:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_only_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_WCDMA_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_wcdma_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_GSM_WCDMA_LTE:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_gsm_wcdma_lte_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_CDMA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_cdma_evdo_gsm_wcdma_summary);
                break;
            case Phone.NT_MODE_TD_SCDMA_LTE_CDMA_EVDO_GSM_WCDMA:
                mButtonPreferredNetworkMode.setSummary(
                        R.string.preferred_network_mode_td_scdma_lte_cdma_evdo_gsm_wcdma_summary);
                break;
            default:
                mButtonPreferredNetworkMode.setSummary(
File
MobileNetworkSettings.java
Developer's decision
Version 2
Kind of conflict
Break statement
Case statement
Method invocation
Chunk
Conflicting content 
import com.android.phone.OtaUtils.CdmaOtaScreenState;
import com.android.server.sip.SipService;

<<<<<<< HEAD
import android.os.Vibrator;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.os.HandlerThread;
=======
import org.codeaurora.ims.IImsService;
import static com.android.internal.telephony.MSimConstants.DEFAULT_SUBSCRIPTION;
import org.codeaurora.ims.csvt.ICsvtService;
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379

/**
 * Global state for the telephony subsystem when running in the primary
Solution content 
import com.android.phone.OtaUtils.CdmaOtaScreenState;
import com.android.server.sip.SipService;

import android.os.Vibrator;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.os.HandlerThread;

import org.codeaurora.ims.IImsService;
import static com.android.internal.telephony.MSimConstants.DEFAULT_SUBSCRIPTION;
import org.codeaurora.ims.csvt.ICsvtService;

/**
 * Global state for the telephony subsystem when running in the primary
File
PhoneGlobals.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
            intentFilter.addAction(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
            intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
            intentFilter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
<<<<<<< HEAD
            intentFilter.addAction(ACTION_VIBRATE_60);
=======
            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
            intentFilter.addAction(Intent.ACTION_SCREEN_ON);
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
            if (mTtyEnabled) {
                intentFilter.addAction(TtyIntent.TTY_PREFERRED_MODE_CHANGE_ACTION);
            }
Solution content 
            intentFilter.addAction(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
            intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
            intentFilter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
            intentFilter.addAction(ACTION_VIBRATE_60);
            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
            intentFilter.addAction(Intent.ACTION_SCREEN_ON);
            if (mTtyEnabled) {
                intentFilter.addAction(TtyIntent.TTY_PREFERRED_MODE_CHANGE_ACTION);
            }
File
PhoneGlobals.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
        return PendingIntent.getBroadcast(context, 0, intent, 0);
    }

<<<<<<< HEAD
    /* package */ static PendingIntent getUnblockNumberFromNotificationPendingIntent(
            Context context, String number) {
        Intent intent = new Intent(REMOVE_BLACKLIST);
        intent.putExtra(EXTRA_NUMBER, number);
        intent.putExtra(EXTRA_FROM_NOTIFICATION, true);
        return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
    }

    private static String getCallScreenClassName() {
        return InCallScreen.class.getName();
=======
    protected static String getCallScreenClassName() {
        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {
            return MSimInCallScreen.class.getName();
        } else {
            return InCallScreen.class.getName();
        }
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
    }

    /**
Solution content 
        return PendingIntent.getBroadcast(context, 0, intent, 0);
    }

    /* package */ static PendingIntent getUnblockNumberFromNotificationPendingIntent(
            Context context, String number) {
        Intent intent = new Intent(REMOVE_BLACKLIST);
        intent.putExtra(EXTRA_NUMBER, number);
        intent.putExtra(EXTRA_FROM_NOTIFICATION, true);
        return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
    }

    protected static String getCallScreenClassName() {
        if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) {
            return MSimInCallScreen.class.getName();
        } else {
            return InCallScreen.class.getName();
        }
    }

    /**
File
PhoneGlobals.java
Developer's decision
Combination
Kind of conflict
If statement
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
                if (ringerMode == AudioManager.RINGER_MODE_SILENT) {
                    notifier.silenceRinger();
                }
<<<<<<< HEAD
            } else if (action.equals(ACTION_VIBRATE_60)) {
                if (VDBG) Log.d(LOG_TAG, "mReceiver: ACTION_VIBRATE_60");
                mAM.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 60000, mVibrateIntent);
                vibrate(70, 70, -1);
            } else if (action.equals(REMOVE_BLACKLIST)) {
                if (intent.getBooleanExtra(EXTRA_FROM_NOTIFICATION, false)) {
                    // Dismiss the notification that brought us here
                    notificationMgr.cancelBlacklistedCallNotification();
                    blackList.delete(intent.getStringExtra(EXTRA_NUMBER));
=======
            } else if (action.equals(Intent.ACTION_SCREEN_OFF) ||
                action.equals(Intent.ACTION_SCREEN_ON)) {
                if (VDBG) Log.d(LOG_TAG, "mReceiver: ACTION_SCREEN_OFF" +
                        " / ACTION_SCREEN_ON");
                /*
                 * Disable Acclerometer Listener while in-call and the screen is off.
                 * This is done to ensure that power consumption is kept to a minimum
                 * in such a scenario
                 */
                if(mAccelerometerListener != null) {
                    mAccelerometerListener.enable(mLastPhoneState == PhoneConstants.State.OFFHOOK
                            && action.equals(Intent.ACTION_SCREEN_ON));
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
                }
            }
        }
Solution content 
                if (ringerMode == AudioManager.RINGER_MODE_SILENT) {
                    notifier.silenceRinger();
                }
            } else if (action.equals(Intent.ACTION_SCREEN_OFF) ||
                action.equals(Intent.ACTION_SCREEN_ON)) {
                if (VDBG) Log.d(LOG_TAG, "mReceiver: ACTION_SCREEN_OFF" +
                        " / ACTION_SCREEN_ON");
                /*
                 * Disable Acclerometer Listener while in-call and the screen is off.
                 * This is done to ensure that power consumption is kept to a minimum
                 * in such a scenario
                 */
                if(mAccelerometerListener != null) {
                    mAccelerometerListener.enable(mLastPhoneState == PhoneConstants.State.OFFHOOK
                            && action.equals(Intent.ACTION_SCREEN_ON));
                }
            } else if (action.equals(ACTION_VIBRATE_60)) {
                if (VDBG) Log.d(LOG_TAG, "mReceiver: ACTION_VIBRATE_60");
                mAM.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 60000, mVibrateIntent);
                vibrate(70, 70, -1);
            } else if (action.equals(REMOVE_BLACKLIST)) {
                if (intent.getBooleanExtra(EXTRA_FROM_NOTIFICATION, false)) {
                    // Dismiss the notification that brought us here
                    notificationMgr.cancelBlacklistedCallNotification();
                    blackList.delete(intent.getStringExtra(EXTRA_NUMBER));
                }
            }
        }
File
PhoneGlobals.java
Developer's decision
Concatenation
Kind of conflict
Comment
If statement
Method invocation
Chunk
Conflicting content 
        return mPhone.getLteOnCdmaMode();
    }

<<<<<<< HEAD
    public int getLteOnGsmMode() {
        return mPhone.getLteOnGsmMode();
=======
    // Gets the retry count during PIN1/PUK1 verification.
    public int getIccPin1RetryCount() {
        return mPhone.getIccCard().getIccPin1RetryCount();
    }

    public void setPhone(Phone phone) {
        mPhone = phone;
>>>>>>> 94bd03af80cda55c0cf1f6332192b3e32f63e379
    }
}
Solution content 
        return mPhone.getLteOnCdmaMode();
    }

    public int getLteOnGsmMode() {
        return mPhone.getLteOnGsmMode();
    }

    // Gets the retry count during PIN1/PUK1 verification.
    public int getIccPin1RetryCount() {
        return mPhone.getIccCard().getIccPin1RetryCount();
    }

    public void setPhone(Phone phone) {
        mPhone = phone;
    }
}
File
PhoneInterfaceManager.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Method declaration
Method invocation
Method signature
Return statement
Variable