Projects >> platform_frameworks_base >>3fa12d459d16fb1d3d06b6c68b201340c9d3afcd

Chunk
Conflicting content 
                        int intState = Integer.parseInt(state);
                        if ("usb_connected".equals(name)) {
                            mConnected = intState;
<<<<<<< HEAD
                            // trigger an Intent broadcast
                            if (mSystemReady) {
                                // debounce disconnects
                                update(mConnected == 0);
                            }
                        } else if ("usb_configuration".equals(name)) {
                            mConfiguration = intState;
                            // trigger an Intent broadcast
                            if (mSystemReady) {
=======
                            // trigger an Intent broadcast
                            if (mSystemReady) {
                                // debounce disconnects
                                update(mConnected == 0);
                            }
                        } else if ("usb_configuration".equals(name)) {
                            mConfiguration = intState;
                            // trigger an Intent broadcast
                            if (mSystemReady) {
>>>>>>> fc88f94fc32fc010b153af32dea8e1fd4bae1f19
                                update(mConnected == 0);
                            }
                        }
Solution content 
                        int intState = Integer.parseInt(state);
                        if ("usb_connected".equals(name)) {
                            mConnected = intState;
                            // trigger an Intent broadcast
                            if (mSystemReady) {
                                // debounce disconnects
                                update(mConnected == 0);
                            }
                        } else if ("usb_configuration".equals(name)) {
                            mConfiguration = intState;
                            // trigger an Intent broadcast
                            if (mSystemReady) {
                                update(mConnected == 0);
                            }
                        }
File
UsbService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
If statement
Variable
Chunk
Conflicting content 
        mContext = context;
        init();  // set initial status

<<<<<<< HEAD
        if (mConfiguration >= 0) {
            mUEventObserver.startObserving(USB_CONNECTED_MATCH);
            mUEventObserver.startObserving(USB_CONFIGURATION_MATCH);
            mUEventObserver.startObserving(USB_FUNCTIONS_MATCH);
        }
=======
        mUEventObserver.startObserving(USB_CONNECTED_MATCH);
        mUEventObserver.startObserving(USB_CONFIGURATION_MATCH);
        mUEventObserver.startObserving(USB_FUNCTIONS_MATCH);
>>>>>>> fc88f94fc32fc010b153af32dea8e1fd4bae1f19
    }

    private final void init() {
Solution content 
        mContext = context;
        init();  // set initial status

        if (mConfiguration >= 0) {
            mUEventObserver.startObserving(USB_CONNECTED_MATCH);
            mUEventObserver.startObserving(USB_CONFIGURATION_MATCH);
            mUEventObserver.startObserving(USB_FUNCTIONS_MATCH);
        }
    }

    private final void init() {
File
UsbService.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
            int len = file.read(buffer, 0, 1024);
            file.close();
            mConnected = Integer.valueOf((new String(buffer, 0, len)).trim());
<<<<<<< HEAD

            file = new FileReader(USB_CONFIGURATION_PATH);
            len = file.read(buffer, 0, 1024);
            file.close();
            mConfiguration = Integer.valueOf((new String(buffer, 0, len)).trim());
=======
>>>>>>> fc88f94fc32fc010b153af32dea8e1fd4bae1f19

            file = new FileReader(USB_CONFIGURATION_PATH);
            len = file.read(buffer, 0, 1024);
Solution content 
            int len = file.read(buffer, 0, 1024);
            file.close();
            mConnected = Integer.valueOf((new String(buffer, 0, len)).trim());

            file = new FileReader(USB_CONFIGURATION_PATH);
            len = file.read(buffer, 0, 1024);
            file.close();
            mConfiguration = Integer.valueOf((new String(buffer, 0, len)).trim());
File
UsbService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
    void systemReady() {
        synchronized (this) {
<<<<<<< HEAD
            if (mContext.getResources().getBoolean(
                    com.android.internal.R.bool.config_hasUsbHostSupport)) {
                // start monitoring for connected USB devices
                initHostSupport();
            }

=======
>>>>>>> fc88f94fc32fc010b153af32dea8e1fd4bae1f19
            update(false);
            mSystemReady = true;
        }
Solution content 
    void systemReady() {
        synchronized (this) {
            if (mContext.getResources().getBoolean(
                    com.android.internal.R.bool.config_hasUsbHostSupport)) {
                // start monitoring for connected USB devices
                initHostSupport();
            }

            update(false);
            mSystemReady = true;
        }
File
UsbService.java
Developer's decision
Version 1
Kind of conflict
If statement