Projects >> packages_apps_phone >>1e143e28c5bfb83439b82143f775b0479745e4d5

Chunk
Conflicting content 
    // Voice Recognition - true if Voice Recognition is active, false otherwise
    private boolean mVoiceRecognitionStarted;

<<<<<<< HEAD
    // is CHLD=1 command active from the remote side, as the call status
    // updates are different here need specific hanlding.
    private boolean mIsChld1Command;
=======
    private HandsfreeMessageHandler mHandler;
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21

    public static String typeToString(int type) {
        switch (type) {
Solution content 
    // Voice Recognition - true if Voice Recognition is active, false otherwise
    private boolean mVoiceRecognitionStarted;

    // is CHLD=1 command active from the remote side, as the call status
    // updates are different here need specific hanlding.
    private boolean mIsChld1Command;
    private HandsfreeMessageHandler mHandler;

    public static String typeToString(int type) {
        switch (type) {
File
BluetoothHandsfree.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
    private static final int MESSAGE_CHECK_PENDING_SCO = 6;
    private static final int SCO_AUDIO_STATE = 7;
    private static final int SCO_CONNECTION_CHECK = 8;
<<<<<<< HEAD
    private static final int CODEC_CONNECTION_SETUP_COMPLETED = 9;
    private static final int CODEC_CONNECTION_SETUP_TIMEOUT = 10;
=======
    private static final int BATTERY_CHANGED = 9;
    private static final int SIGNAL_STRENGTH_CHANGED = 10;

    private final class HandsfreeMessageHandler extends Handler {
        private HandsfreeMessageHandler(Looper looper) {
            super(looper);
        }
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21

        @Override
        public void handleMessage(Message msg) {
Solution content 
    private static final int MESSAGE_CHECK_PENDING_SCO = 6;
    private static final int SCO_AUDIO_STATE = 7;
    private static final int SCO_CONNECTION_CHECK = 8;
    private static final int BATTERY_CHANGED = 9;
    private static final int SIGNAL_STRENGTH_CHANGED = 10;
    private static final int CODEC_CONNECTION_SETUP_COMPLETED = 11;
    private static final int CODEC_CONNECTION_SETUP_TIMEOUT = 12;

    private final class HandsfreeMessageHandler extends Handler {
        private HandsfreeMessageHandler(Looper looper) {
            super(looper);
        }

        @Override
        public void handleMessage(Message msg) {
File
BluetoothHandsfree.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Method declaration
Chunk
Conflicting content 
                        Log.e(TAG, "Timeout waiting for voice recognition to start");
                        sendURC("ERROR");
                    }
<<<<<<< HEAD
                    break;
                case MESSAGE_CHECK_PENDING_SCO:
                    if (mPendingScoForA2dp) {
=======
                }
                break;
            case MESSAGE_CHECK_PENDING_SCO:
                synchronized (BluetoothHandsfree.this) {
                    // synchronized
                    // Protect test/change of mPendingSco
                    if (mPendingSco && isA2dpMultiProfile()) {
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21
                        Log.w(TAG, "Timeout suspending A2DP for SCO (mA2dpState = " +
                                mA2dpState + "). Starting SCO anyway");
                        connectScoThread(CODEC_MSBC == mRemoteCodec);
Solution content 
                }
                break;
                        Log.e(TAG, "Timeout waiting for voice recognition to start");
                        sendURC("ERROR");
                    }
            case MESSAGE_CHECK_PENDING_SCO:
                synchronized (BluetoothHandsfree.this) {
                    // synchronized
                    // Protect test/change of mPendingSco
                    if (mPendingScoForA2dp) {
                        Log.w(TAG, "Timeout suspending A2DP for SCO (mA2dpState = " +
                                mA2dpState + "). Starting SCO anyway");
                        connectScoThread(CODEC_MSBC == mRemoteCodec);
File
BluetoothHandsfree.java
Developer's decision
Combination
Kind of conflict
Break statement
Case statement
If statement
Synchronized statement
Chunk
Conflicting content 
                break;
            }
        }
<<<<<<< HEAD
    };

    void fallbackNb() {
        if ((0x0 != (mLocalBrsf & BRSF_AG_CODEC_NEGOTIATION)) &&
            (0x0 != (mRemoteBrsf & BRSF_HF_CODEC_NEGOTIATION)) &&
            mRemoteCodec == CODEC_MSBC) {
            // fallback to try NB while trying WBS
            mRemoteCodec = 0;
            mLocalCodec = CODEC_CVSD;
            if (DBG) log("SCO_FAILED, sending +BCS:1 to try NB");
            mExpectingBCS = true;
            sendURC("+BCS:1");
            Message msg = mHandler.obtainMessage(CODEC_CONNECTION_SETUP_TIMEOUT);
            mHandler.sendMessageDelayed(msg, CODEC_NEGOTIATION_SETUP_TIMEOUT_VALUE);
        }
=======
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21
    }

    private synchronized void setAudioState(int state, BluetoothDevice device) {
Solution content 
                break;
            }
        }
    }

    void fallbackNb() {
        if ((0x0 != (mLocalBrsf & BRSF_AG_CODEC_NEGOTIATION)) &&
            (0x0 != (mRemoteBrsf & BRSF_HF_CODEC_NEGOTIATION)) &&
            mRemoteCodec == CODEC_MSBC) {
            // fallback to try NB while trying WBS
            mRemoteCodec = 0;
            mLocalCodec = CODEC_CVSD;
            if (DBG) log("SCO_FAILED, sending +BCS:1 to try NB");
            mExpectingBCS = true;
            sendURC("+BCS:1");
            Message msg = mHandler.obtainMessage(CODEC_CONNECTION_SETUP_TIMEOUT);
            mHandler.sendMessageDelayed(msg, CODEC_NEGOTIATION_SETUP_TIMEOUT_VALUE);
        }
    }

    private synchronized void setAudioState(int state, BluetoothDevice device) {
File
BluetoothHandsfree.java
Developer's decision
Manual
Kind of conflict
If statement
Method signature
Chunk
Conflicting content 
                    mRemoteHeadsets.put(info.mRemoteDevice, remoteHeadset);

                    try {
<<<<<<< HEAD
                        if (!mBluetoothService.notifyIncomingConnection(
                            info.mRemoteDevice.getAddress())) {
                            Log.e(TAG, "notifyIncomingConnection failed");
                            rejectIncomingConnection(info);
                        }
=======
                        mBluetoothService.notifyIncomingConnection(
                           info.mRemoteDevice.getAddress(), false);
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21
                    } catch (RemoteException e) {
                        Log.e(TAG, "notifyIncomingConnection");
                    }
Solution content 
                    mRemoteHeadsets.put(info.mRemoteDevice, remoteHeadset);

                    try {
                        if (!mBluetoothService.notifyIncomingConnection(
                            info.mRemoteDevice.getAddress(), false)) {
                            Log.e(TAG, "notifyIncomingConnection failed");
                            rejectIncomingConnection(info);
                        }
                    } catch (RemoteException e) {
                        Log.e(TAG, "notifyIncomingConnection");
                    }
File
BluetoothHeadsetService.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
                    mRemoteHeadsets.get(info.mRemoteDevice).mIncomingInfo = info;

                    try {
<<<<<<< HEAD
                        if (!mBluetoothService.notifyIncomingConnection(
                            info.mRemoteDevice.getAddress())) {
                            Log.e(TAG, "notifyIncomingConnection failed");
                            rejectIncomingConnection(info);
                        }
=======
                        mBluetoothService.notifyIncomingConnection(
                            info.mRemoteDevice.getAddress(), false);
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21
                    } catch (RemoteException e) {
                        Log.e(TAG, "notifyIncomingConnection");
                    }
Solution content 
                    mRemoteHeadsets.get(info.mRemoteDevice).mIncomingInfo = info;

                    try {
                        if (!mBluetoothService.notifyIncomingConnection(
                            info.mRemoteDevice.getAddress(), false)) {
                            Log.e(TAG, "notifyIncomingConnection failed");
                            rejectIncomingConnection(info);
                        }
                    } catch (RemoteException e) {
                        Log.e(TAG, "notifyIncomingConnection");
                    }
File
BluetoothHeadsetService.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
            return CallStatusCode.NO_PHONE_NUMBER_SUPPLIED;
        }

<<<<<<< HEAD
        boolean isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(number, mApp.mContext);
=======

        // Sanity-check that ACTION_CALL_EMERGENCY is used if and only if
        // this is a call to an emergency number
        // (This is just a sanity-check; this policy *should* really be
        // enforced in OutgoingCallBroadcaster.onCreate(), which is the
        // main entry point for the CALL and CALL_* intents.)
        boolean isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(number, mApp);
        boolean isPotentialEmergencyNumber =
                PhoneNumberUtils.isPotentialLocalEmergencyNumber(number, mApp);
>>>>>>> 5c7d3167b8372b040d6c0a695f7c0822d80b2c21
        boolean isEmergencyIntent = Intent.ACTION_CALL_EMERGENCY.equals(intent.getAction());

        if (isPotentialEmergencyNumber && !isEmergencyIntent) {
Solution content 
            return CallStatusCode.NO_PHONE_NUMBER_SUPPLIED;
        }


        // Sanity-check that ACTION_CALL_EMERGENCY is used if and only if
        // this is a call to an emergency number
        // (This is just a sanity-check; this policy *should* really be
        // enforced in OutgoingCallBroadcaster.onCreate(), which is the
        // main entry point for the CALL and CALL_* intents.)
        boolean isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(number, mApp);
        boolean isPotentialEmergencyNumber =
                PhoneNumberUtils.isPotentialLocalEmergencyNumber(number, mApp);
        boolean isEmergencyIntent = Intent.ACTION_CALL_EMERGENCY.equals(intent.getAction());

        if (isPotentialEmergencyNumber && !isEmergencyIntent) {
File
CallController.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable