Projects >> android_packages_apps_Bluetooth >>3683c022d0b912e13f398537c140c8f291a7f9b1

Chunk
Conflicting content 
import com.android.bluetooth.avrcp.AvrcpControllerService;
import com.android.bluetooth.hdp.HealthService;
import com.android.bluetooth.hfp.HeadsetService;
<<<<<<< HEAD
import com.android.bluetooth.hfpclient.HeadsetClientService;
=======
import com.android.bluetooth.hfpclient.HandsfreeClientService;
>>>>>>> a4b39a558accff559561d60dbdafe9cf457a430b
import com.android.bluetooth.hid.HidService;
import com.android.bluetooth.pan.PanService;
import com.android.bluetooth.gatt.GattService;
Solution content 
import com.android.bluetooth.avrcp.AvrcpControllerService;
import com.android.bluetooth.hdp.HealthService;
import com.android.bluetooth.hfp.HeadsetService;
import com.android.bluetooth.hfpclient.HeadsetClientService;
import com.android.bluetooth.hid.HidService;
import com.android.bluetooth.pan.PanService;
import com.android.bluetooth.gatt.GattService;
File
Config.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        PanService.class,
        GattService.class,
        BluetoothMapService.class,
<<<<<<< HEAD
        HeadsetClientService.class,
        AvrcpControllerService.class,
=======
        HandsfreeClientService.class
>>>>>>> a4b39a558accff559561d60dbdafe9cf457a430b
    };
    /**
     * Resource flag to indicate whether profile is supported or not.
Solution content 
        PanService.class,
        GattService.class,
        BluetoothMapService.class,
        HeadsetClientService.class,
        AvrcpControllerService.class,
    };
    /**
     * Resource flag to indicate whether profile is supported or not.
File
Config.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
        R.bool.profile_supported_pan,
        R.bool.profile_supported_gatt,
        R.bool.profile_supported_map,
<<<<<<< HEAD
        R.bool.profile_supported_hfpclient,
        R.bool.profile_supported_avrcp_controller,
=======
        R.bool.profile_supported_hfpclient
>>>>>>> a4b39a558accff559561d60dbdafe9cf457a430b
    };

    private static Class[] SUPPORTED_PROFILES = new Class[0];
Solution content 
        R.bool.profile_supported_pan,
        R.bool.profile_supported_gatt,
        R.bool.profile_supported_map,
        R.bool.profile_supported_hfpclient,
        R.bool.profile_supported_avrcp_controller,
    };

    private static Class[] SUPPORTED_PROFILES = new Class[0];
File
Config.java
Developer's decision
Version 1
Kind of conflict
Other