Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mike dooley
2014-11-06 02:43:59 +00:00
committed by Android (Google) Code Review
parent fc4e6f70f6 1cf14ac5dc
commit 8355c500ea
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28104,6 +28104,7 @@ package android.telecom {
method public final int getCapabilities(); method public final int getCapabilities();
method public final java.util.List<android.telecom.Connection> getConferenceableConnections(); method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
method public final java.util.List<android.telecom.Connection> getConnections(); 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 final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
method public android.telecom.Connection getPrimaryConnection(); method public android.telecom.Connection getPrimaryConnection();
method public final int getState(); method public final int getState();

7
telecomm/java/android/telecom/Conference.java
View File

@@ -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. * Sets the capabilities of a conference. See {@link PhoneCapabilities} for valid values.
* *