commit 4055d648993c35be19487f7ab82e337197e25297
author Santos Cordon <santoscordon@google.com> Tue May 12 14:19:24 2015 -0700
committer Santos Cordon <santoscordon@google.com> Tue May 12 14:19:24 2015 -0700
tree 5ea29d436f65733e8e45927d0c14d81bbff22767
parent 5d2e4f20fee033a22fbadffb291c4e47f35b7633

Fix build break.

Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 50dfc84..29e5235 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32234,7 +32234,7 @@
     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();

telecomm/java/android/telecom/Conference.java

diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index 89967d6..e2971f9 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -462,7 +462,7 @@
      * @hide
      */
     @SystemApi
-    public final Connection getPrimaryConnection() {
+    public Connection getPrimaryConnection() {
         if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) {
             return null;
         }