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

Merge "Fix build break." into mnc-dev

Browse Source
This commit is contained in:
Santos Cordon
2015-05-12 21:23:01 +00:00
committed by Android (Google) Code Review
parent 0cf42ffbbe 4055d64899
commit 115cdd488b
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

@@ -32188,7 +32188,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;
}