Projects >> openxc-android >>96cd6d1cef457c20fd9295ea74791c9679717429

Chunk
Conflicting content 
        if(mPipeline != null) {
            mPipeline.stop();
        }
<<<<<<< HEAD
=======
        if(mUsbDevice != null) {
            mUsbDevice.close();
        }
>>>>>>> 577f211fd90f94bcb4fad884513cb067084df829
        releaseWakeLock();
    }
Solution content 
        if(mPipeline != null) {
            mPipeline.stop();
        }
        releaseWakeLock();
    }
File
VehicleService.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    private void initializeDefaultSources() {
        mPipeline.clearSources();
        mPipeline.addSource(mApplicationSource);
<<<<<<< HEAD

        try {
            mUsbDevice = new UsbVehicleDataSource(this);
        } catch(DataSourceException e) {
            Log.w(TAG, "Unable to add default USB data source", e);
        }
        mController = mUsbDevice;
        mPipeline.addSource(mUsbDevice);
=======
        if(mUsbDevice != null) {
            mPipeline.addSource(mUsbDevice);
        }
>>>>>>> 577f211fd90f94bcb4fad884513cb067084df829
    }

    private final VehicleServiceInterface.Stub mBinder =
Solution content 
    private void initializeDefaultSources() {
        mPipeline.clearSources();
        mPipeline.addSource(mApplicationSource);

        try {
            mUsbDevice = new UsbVehicleDataSource(this);
            mPipeline.addSource(mUsbDevice);
            mController = mUsbDevice;
        } catch(DataSourceException e) {
            Log.w(TAG, "Unable to add default USB data source", e);
        }
    }

    private final VehicleServiceInterface.Stub mBinder =
File
VehicleService.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Try statement
Chunk
Conflicting content 
            public void set(RawMeasurement measurement) {
                if(mController != null) {
                    mController.set(measurement);
<<<<<<< HEAD
=======
                } else {
                    Log.w(TAG, "Unable to set value -- controller is "
                            + mController);
>>>>>>> 577f211fd90f94bcb4fad884513cb067084df829
                }
            }
Solution content 
            public void set(RawMeasurement measurement) {
                if(mController != null) {
                    mController.set(measurement);
                } else {
                    Log.w(TAG, "Unable to set value -- controller is "
                            + mController);
                }
            }
File
VehicleService.java
Developer's decision
Version 2
Kind of conflict
Method invocation