Projects >> platform_frameworks_base >>a5e15f65d2f1c68d6f1566dcbaa2a0d1ebe039d5

Chunk
Conflicting content 
        public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
        public void onStatusHintsChanged(Connection c, StatusHints statusHints) {}
        public void onStartActivityFromInCall(Connection c, PendingIntent intent) {}
<<<<<<< HEAD
        public void onConferenceableConnectionsChanged(
                Connection c, List conferenceableConnections) {}
=======
        public void onFailed(Connection c, int code, String msg) {}
>>>>>>> dc568d27056c8b0f6abea393fa756aeac77de456
    }

    public final class State {
Solution content 
        public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
        public void onStatusHintsChanged(Connection c, StatusHints statusHints) {}
        public void onStartActivityFromInCall(Connection c, PendingIntent intent) {}
        public void onConferenceableConnectionsChanged(
                Connection c, List conferenceableConnections) {}
    }

    public final class State {
File
Connection.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
        for (Listener l : mListeners) {
            l.onStatusHintsChanged(this, statusHints);
        }
<<<<<<< HEAD
    }

    /**
     * Sets the connections with which this connection can be conferenced.
     *
     * @param conferenceableConnections The set of connections this connection can conference with.
     */
    public final void setConferenceableConnections(List conferenceableConnections) {
        clearConferenceableList();
        for (Connection c : conferenceableConnections) {
            // If statement checks for duplicates in input. It makes it N^2 but we're dealing with a
            // small amount of items here.
            if (!mConferenceableConnections.contains(c)) {
                c.addConnectionListener(mConnectionDeathListener);
                mConferenceableConnections.add(c);
            }
        }
        fireOnConferenceableConnectionsChanged();
=======
>>>>>>> dc568d27056c8b0f6abea393fa756aeac77de456
    }

    /**
Solution content 
        for (Listener l : mListeners) {
            l.onStatusHintsChanged(this, statusHints);
        }
    }

    /**
     * Sets the connections with which this connection can be conferenced.
     *
     * @param conferenceableConnections The set of connections this connection can conference with.
     */
    public final void setConferenceableConnections(List conferenceableConnections) {
        clearConferenceableList();
        for (Connection c : conferenceableConnections) {
            // If statement checks for duplicates in input. It makes it N^2 but we're dealing with a
            // small amount of items here.
            if (!mConferenceableConnections.contains(c)) {
                c.addConnectionListener(mConnectionDeathListener);
                mConferenceableConnections.add(c);
            }
        }
        fireOnConferenceableConnectionsChanged();
    }

    /**
File
Connection.java
Developer's decision
Version 1
Kind of conflict
Comment
For statement
Method invocation
Method signature
Chunk
Conflicting content 
    public void onDisconnect() {}

    /**
<<<<<<< HEAD
     * Notifies this Connection of a request to separate from its parent conference.
=======
     * Notifies this Connection of a request to disconnect.
>>>>>>> dc568d27056c8b0f6abea393fa756aeac77de456
     */
    public void onSeparate() {}
Solution content 
    public void onDisconnect() {}

    /**
     * Notifies this Connection of a request to separate from its parent conference.
     */
    public void onSeparate() {}
File
Connection.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
<<<<<<< HEAD
     */
    public void onPhoneAccountClicked() {}

    /**
     * Merge this connection and the specified connection into a conference call.  Once the
     * connections are merged, the calls should be added to the an existing or new
     * {@code Conference} instance. For new {@code Conference} instances, use
     * {@code ConnectionService#addConference}.
     *
     * @param otherConnection The connection with which this connection should be conferenced.
     */
    public void onConferenceWith(Connection otherConnection) {}

=======
>>>>>>> dc568d27056c8b0f6abea393fa756aeac77de456
    private void addChild(Connection connection) {
        Log.d(this, "adding child %s", connection);
        mChildConnections.add(connection);
Solution content 
     */
    public void onPhoneAccountClicked() {}

    /**
     * Merge this connection and the specified connection into a conference call.  Once the
     * connections are merged, the calls should be added to the an existing or new
     * {@code Conference} instance. For new {@code Conference} instances, use
     * {@code ConnectionService#addConference}.
     *
     * @param otherConnection The connection with which this connection should be conferenced.
     */
    public void onConferenceWith(Connection otherConnection) {}

    private void addChild(Connection connection) {
        Log.d(this, "adding child %s", connection);
        mChildConnections.add(connection);
File
Connection.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration