Projects >> android-frameworks-base-with-remote-control-service >>037f61bb832f099ce8f015226c034febbf0221c0

Chunk
Conflicting content 
    // timeout value waiting for all the devices to be disconnected
    private static final int DEVICES_DISCONNECT_TIMEOUT_TIME = 3000;

<<<<<<< HEAD
    private static final int PREPARE_BLUETOOTH_TIMEOUT_TIME = 10000;
=======
    private static final int PREPARE_BLUETOOTH_TIMEOUT_TIME = 7000;
>>>>>>> 4967660ce9baa23932871f5c054450a009845b1b

    BluetoothAdapterStateMachine(Context context, BluetoothService bluetoothService,
                                 BluetoothAdapter bluetoothAdapter) {
Solution content 
    // timeout value waiting for all the devices to be disconnected
    private static final int DEVICES_DISCONNECT_TIMEOUT_TIME = 3000;

    private static final int PREPARE_BLUETOOTH_TIMEOUT_TIME = 10000;

    BluetoothAdapterStateMachine(Context context, BluetoothService bluetoothService,
                                 BluetoothAdapter bluetoothAdapter) {
File
BluetoothAdapterStateMachine.java
Developer's decision
Version 1
Kind of conflict
Attribute