Projects >> android-frameworks-base-with-remote-control-service >>f8fdec50c7871b640c13cfe3e2e7a3b449f62f69

Chunk
Conflicting content 
<<<<<<< HEAD

    /**
     * default connections.
     */
    public static final int TYPE_WIMAX       = 6;
     * Bluetooth data connection. This is used for Bluetooth reverse tethering.
     * @hide
     */
    public static final int TYPE_BLUETOOTH   = 7;

    /** {@hide} */
    public static final int TYPE_DUMMY       = 8;
=======
    /**
     * Bluetooth data connection.
     * @hide
     */
    public static final int TYPE_BLUETOOTH   = 7;
    /** {@hide} */
    public static final int TYPE_DUMMY       = 8;
    /** {@hide} */
    public static final int TYPE_ETHERNET    = 9;
>>>>>>> aa3866e6fa2d0c0e026b78cf43dccce67a2021e5
    /** {@hide} TODO: Need to adjust this for WiMAX. */
    public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;
    /** {@hide} TODO: Need to adjust this for WiMAX. */
Solution content 
     * default connections.
     */
    public static final int TYPE_WIMAX       = 6;

    /**
     * Bluetooth data connection. This is used for Bluetooth reverse tethering.
     * @hide
     */
    public static final int TYPE_BLUETOOTH   = 7;

    /** {@hide} */
    public static final int TYPE_DUMMY       = 8;
    /** {@hide} */
    public static final int TYPE_ETHERNET    = 9;
    /** {@hide} TODO: Need to adjust this for WiMAX. */
    public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;
    /** {@hide} TODO: Need to adjust this for WiMAX. */
File
ConnectivityManager.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
    public static final int NETWORK_TYPE_IDEN = 11;
    /** Current network is EVDO revision B*/
    public static final int NETWORK_TYPE_EVDO_B = 12;
<<<<<<< HEAD
    /** Current network is LTE */
    public static final int NETWORK_TYPE_LTE = 13;
    /** Current network is eHRPD */
    public static final int NETWORK_TYPE_EHRPD = 14;

=======
    /** @hide */
    public static final int NETWORK_TYPE_LTE = 13;
    /** @hide */
    public static final int NETWORK_TYPE_EHRPD = 14;
>>>>>>> aa3866e6fa2d0c0e026b78cf43dccce67a2021e5

    /**
     * Returns a constant indicating the radio technology (network type)
Solution content 
    public static final int NETWORK_TYPE_IDEN = 11;
    /** Current network is EVDO revision B*/
    public static final int NETWORK_TYPE_EVDO_B = 12;
    /** Current network is LTE */
    public static final int NETWORK_TYPE_LTE = 13;
    /** Current network is eHRPD */
    public static final int NETWORK_TYPE_EHRPD = 14;

    /**
     * Returns a constant indicating the radio technology (network type)
File
TelephonyManager.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment