Projects >> android_frameworks_base >>a0449f03eb12462189f7a75f55e4751e1e2bcbcd

Chunk
Conflicting content
    /** Error attempting to send a message */
    public static final int STATUS_SEND_UNSUCCESSFUL = 2;

<<<<<<< HEAD
=======
    /** CMD_FULLY_CONNECTED refused because a connection already exists*/
    public static final int STATUS_FULL_CONNECTION_REFUSED_ALREADY_CONNECTED = 3;

>>>>>>> 210830664d8525b6913a349b067ce11245f3536b
    /** Service connection */
    private AsyncChannelConnection mConnection;
Solution content
    /** Error attempting to send a message */
    public static final int STATUS_SEND_UNSUCCESSFUL = 2;

    /** CMD_FULLY_CONNECTED refused because a connection already exists*/
    public static final int STATUS_FULL_CONNECTION_REFUSED_ALREADY_CONNECTED = 3;

    /** Service connection */
    private AsyncChannelConnection mConnection;
File
AsyncChannel.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment