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

Fix build break.

Browse Source 
Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4
This commit is contained in:
Santos Cordon
2015-05-12 14:19:24 -07:00
parent 5d2e4f20fe
commit 4055d64899
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -32234,7 +32234,7 @@ package android.telecom {
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.Connection getPrimaryConnection();
method public android.telecom.Connection getPrimaryConnection();
method public final int getState();
method public final android.telecom.StatusHints getStatusHints();
method public android.telecom.Connection.VideoProvider getVideoProvider();

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

@@ -462,7 +462,7 @@ public abstract class Conference implements Conferenceable {
* @hide
*/
@SystemApi
public final Connection getPrimaryConnection() {
public Connection getPrimaryConnection() {
if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) {
return null;
}