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

Commit 3f60f6c0 authored by mike dooley's avatar mike dooley Committed by Android Git Automerger
Browse files

am 9beb54db: am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect... 

am 9beb54db: am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev

* commit '9beb54db':
  Adding method to get disconnect cause from conference
parents 9e522f34 9beb54db

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28344,6 +28344,7 @@ package android.telecom { 
    method public final int getCapabilities();

    method public final java.util.List<android.telecom.Connection> getConferenceableConnections();

    method public final java.util.List<android.telecom.Connection> getConnections();

    method public final android.telecom.DisconnectCause getDisconnectCause();

    method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();

    method public android.telecom.Connection getPrimaryConnection();

    method public final int getState();

telecomm/java/android/telecom/Conference.java

+7 −0
Original line number Diff line number Diff line
@@ -206,6 +206,13 @@ public abstract class Conference { 
        }

    }



    /**

     * @return The {@link DisconnectCause} for this connection.

     */

    public final DisconnectCause getDisconnectCause() {

        return mDisconnectCause;

    }



    /**

     * Sets the capabilities of a conference. See {@link PhoneCapabilities} for valid values.

     *