| Chunk |
|---|
| Conflicting content |
|---|
public static final int NETWORK_TYPE_HSUPA = 9;
/** Current network is HSPA */
public static final int NETWORK_TYPE_HSPA = 10;
<<<<<<< HEAD
/** Current network is iDen */
public static final int NETWORK_TYPE_IDEN = 11;
=======
/** Current network is EVDO revision B*/
public static final int NETWORK_TYPE_EVDO_B = 12;
>>>>>>> 0a5174a6e947d5cbeb8846a1273a90b6de065cbf
/**
* Returns a constant indicating the radio technology (network type) |
| Solution content |
|---|
public static final int NETWORK_TYPE_HSUPA = 9;
/** Current network is HSPA */
public static final int NETWORK_TYPE_HSPA = 10;
/** Current network is iDen */
public static final int NETWORK_TYPE_IDEN = 11;
/** Current network is EVDO revision B*/
public static final int NETWORK_TYPE_EVDO_B = 12;
/**
* Returns a constant indicating the radio technology (network type) |
| File |
|---|
| TelephonyManager.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Comment |