Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1518fc22 authored by Jay Shrauner's avatar Jay Shrauner Committed by Android Git Automerger
Browse files

am de4f8080: am 60841fcb: am 9e18d7ab: Merge "Remove unused onConferenceWith... 

am de4f8080: am 60841fcb: am 9e18d7ab: Merge "Remove unused onConferenceWith method" into lmp-mr1-dev

* commit 'de4f8080':
  Remove unused onConferenceWith method
parents e193dcb6 de4f8080

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28354,7 +28354,6 @@ package android.telecom { 
    method public void onAbort();

    method public void onAnswer();

    method public void onAudioStateChanged(android.telecom.AudioState);

    method public void onConferenceWith(android.telecom.Connection);

    method public void onDisconnect();

    method public void onHold();

    method public void onPlayDtmfTone(char);

telecomm/java/android/telecom/Connection.java

+0 −10
Original line number Diff line number Diff line
@@ -1009,16 +1009,6 @@ public abstract class Connection { 
     */

    public void onPostDialContinue(boolean proceed) {}



    /**

     * 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) {}



    static String toLogSafePhoneNumber(String number) {

        // For unknown number, log empty string.

        if (number == null) {