| Chunk |
|---|
| Conflicting content |
|---|
public static final int TYPE_HANDSFREE = 2;
private final Context mContext;
<<<<<<< HEAD
private final Phone mPhone;
private final BluetoothAdapter mAdapter;
=======
private final CallManager mCM;
>>>>>>> fcf905963c8bca570686594aa696f81def669a93
private final BluetoothA2dp mA2dp;
private BluetoothDevice mA2dpDevice; |
| Solution content |
|---|
public static final int TYPE_HANDSFREE = 2;
private final Context mContext;
private final BluetoothAdapter mAdapter;
private final CallManager mCM;
private final BluetoothA2dp mA2dp;
private BluetoothDevice mA2dpDevice; |
| File |
|---|
| BluetoothHandsfree.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |