Projects >> packages_apps_phone >>8ff3733d62dc6072a54db0e61f17e20f2026018c

Chunk
Conflicting content 
package com.android.phone;

import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
<<<<<<< HEAD
=======
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;

>>>>>>> 10ce310e02f49e5c78d747693dd36b4239594446
import android.content.Context;
import android.os.AsyncResult;
import android.os.Handler;
Solution content 
package com.android.phone;

import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;

import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;

import android.content.Context;
import android.os.AsyncResult;
import android.os.Handler;
File
CallWaitingCheckBoxPreference.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
            }

            if (ar.exception != null) {
<<<<<<< HEAD
                if (DBG) Log.d(LOG_TAG, "handleGetCallWaitingResponse: ar.exception=" + ar.exception);
                setEnabled(false);
                if (tcpListener != null) tcpListener.onError(CallWaitingCheckBoxPreference.this, EXCEPTION_ERROR);
=======
                if (DBG)
                    Log.d(LOG_TAG, "handleGetCallWaitingResponse: ar.exception=" + ar.exception);
                tcpListener.onException(CallWaitingCheckBoxPreference.this,
                        (CommandException)ar.exception);
>>>>>>> 10ce310e02f49e5c78d747693dd36b4239594446
            } else if (ar.userObj instanceof Throwable) {
                if (tcpListener != null) tcpListener.onError(CallWaitingCheckBoxPreference.this, RESPONSE_ERROR);
            } else {
Solution content 
            }

            if (ar.exception != null) {
                if (DBG) {
                    Log.d(LOG_TAG, "handleGetCallWaitingResponse: ar.exception=" + ar.exception);
                }
                if (tcpListener != null) {
                    tcpListener.onException(CallWaitingCheckBoxPreference.this,
                            (CommandException)ar.exception);
                }
            } else if (ar.userObj instanceof Throwable) {
                if (tcpListener != null) tcpListener.onError(CallWaitingCheckBoxPreference.this, RESPONSE_ERROR);
            } else {
File
CallWaitingCheckBoxPreference.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation