| Chunk |
|---|
| Conflicting content |
|---|
public static final int TYPE_WIMAX = 6;
/**
<<<<<<< HEAD
* Bluetooth data connection. This is used for Bluetooth reverse tethering.
=======
* The Default Bluetooth data connection. When active, all data traffic
* will use this connection by default.
>>>>>>> e139167c9109aee203f5fbbdeeab656994d9c9ac
*/
public static final int TYPE_BLUETOOTH = 7;
|
| Solution content |
|---|
public static final int TYPE_WIMAX = 6;
/**
* The Default Bluetooth data connection. When active, all data traffic
* will use this connection by default.
*/
public static final int TYPE_BLUETOOTH = 7;
|
| File |
|---|
| ConnectivityManager.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public static final int TYPE_DUMMY = 8;
/**
<<<<<<< HEAD
* Ethernet data connection. This may be via USB dongle or more
* traditional means.
=======
* The Default Ethernet data connection. When active, all data traffic
* will use this connection by default.
>>>>>>> e139167c9109aee203f5fbbdeeab656994d9c9ac
*/
public static final int TYPE_ETHERNET = 9;
|
| Solution content |
|---|
public static final int TYPE_DUMMY = 8;
/**
* The Default Ethernet data connection. When active, all data traffic
* will use this connection by default.
*/
public static final int TYPE_ETHERNET = 9;
|
| File |
|---|
| ConnectivityManager.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |