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

Chunk
Conflicting content 
     *  @return false on immediate error, true otherwise
     *  @hide
     */
<<<<<<< HEAD
    public boolean suspendSink(BluetoothDevice device) {
=======
    public int suspendSink(BluetoothDevice device) {
>>>>>>> f92c106c40cc429f7da417bc3557e6af7be8a54d
        try {
            return mService.suspendSink(device);
        } catch (RemoteException e) {
Solution content 
     *  @return false on immediate error, true otherwise
     *  @hide
     */
    public boolean suspendSink(BluetoothDevice device) {
        try {
            return mService.suspendSink(device);
        } catch (RemoteException e) {
File
BluetoothA2dp.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
     *  @return false on immediate error, true otherwise
     *  @hide
     */
<<<<<<< HEAD
    public boolean resumeSink(BluetoothDevice device) {
=======
    public int resumeSink(BluetoothDevice device) {
>>>>>>> f92c106c40cc429f7da417bc3557e6af7be8a54d
        try {
            return mService.resumeSink(device);
        } catch (RemoteException e) {
Solution content 
     *  @return false on immediate error, true otherwise
     *  @hide
     */
    public boolean resumeSink(BluetoothDevice device) {
        try {
            return mService.resumeSink(device);
        } catch (RemoteException e) {
File
BluetoothA2dp.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
            return false;
        }
        String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());
<<<<<<< HEAD
        Integer state = mAudioDevices.get(device);
        if (path == null || state == null) {
            return false;
        }
        switch (state.intValue()) {
=======
        if (path == null) {
            return false;
        }
        switch (mAudioDevices.get(device)) {
>>>>>>> f92c106c40cc429f7da417bc3557e6af7be8a54d
        case BluetoothA2dp.STATE_CONNECTED:
            return true;
        case BluetoothA2dp.STATE_PLAYING:
Solution content 
            return false;
        }
        String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());
        Integer state = mAudioDevices.get(device);
        if (path == null || state == null) {
            return false;
        }
        switch (state.intValue()) {
        case BluetoothA2dp.STATE_CONNECTED:
            return true;
        case BluetoothA2dp.STATE_PLAYING:
File
BluetoothA2dpService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Switch statement
Variable
Chunk
Conflicting content 
        }
        switch (mAudioDevices.get(device)) {
>>>>>>> f92c106c40cc429f7da417bc3557e6af7be8a54d
        case BluetoothA2dp.STATE_PLAYING:
            return true;
        case BluetoothA2dp.STATE_CONNECTED:
            return false;
        }
        String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());
<<<<<<< HEAD
        Integer state = mAudioDevices.get(device);
        if (path == null || state == null) {
            return false;
        }
        switch (state.intValue()) {
=======
        if (path == null) {
            return false;
Solution content 
            return false;
        }
        String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());
        Integer state = mAudioDevices.get(device);
        if (path == null || state == null) {
            return false;
        }
        switch (state.intValue()) {
        case BluetoothA2dp.STATE_PLAYING:
            return true;
        case BluetoothA2dp.STATE_CONNECTED:
File
BluetoothA2dpService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Switch statement
Variable