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

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

Browse Source 
* commit '6b93e2b02620034e79cb3bdf6d543c3f96abadd7':
  Adding method to get disconnect cause from conference
This commit is contained in:
mike dooley
2014-11-06 02:55:28 +00:00
committed by Android Git Automerger
parent 0d8d6ba807 6b93e2b026
commit 9beb54db9e
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 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();

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.
*