From 4055d648993c35be19487f7ab82e337197e25297 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Tue, 12 May 2015 14:19:24 -0700 Subject: [PATCH] Fix build break. Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4 --- api/system-current.txt | 2 +- telecomm/java/android/telecom/Conference.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 50dfc84c09114..29e52354a78ba 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32234,7 +32234,7 @@ package android.telecom { method public final java.util.List 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(); diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 89967d699806a..e2971f9145bb1 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -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; }