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

Commit 8355c500 authored by mike dooley's avatar mike dooley Committed by Android (Google) Code Review
Browse files

Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev

parents fc4e6f70 1cf14ac5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28104,6 +28104,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.

     *