From 463dcae219a863aacadb2a9d0a569bd4781a8960 Mon Sep 17 00:00:00 2001
From: Ihab Awad <ihab@google.com>
Date: Thu, 2 Oct 2014 10:11:54 -0700
Subject: [PATCH] Update api/current.txt

Changes made in branch lmp-dev are @hide-den there but not here. When
they propagate downstream, we need to update api/current.txt.

Change-Id: Ic267f62391503d9acfb8451b16d5bb18035c948c
---
 api/current.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 5664e63f6cdcf..755393d9c7a59 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28071,12 +28071,14 @@ package android.telecom {
     method public final void destroy();
     method public final android.telecom.AudioState getAudioState();
     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.PhoneAccountHandle getPhoneAccountHandle();
     method public final int getState();
     method public void onAudioStateChanged(android.telecom.AudioState);
     method public void onDisconnect();
     method public void onHold();
+    method public void onMerge(android.telecom.Connection);
     method public void onMerge();
     method public void onPlayDtmfTone(char);
     method public void onSeparate(android.telecom.Connection);
@@ -28086,6 +28088,7 @@ package android.telecom {
     method public final void removeConnection(android.telecom.Connection);
     method public final void setActive();
     method public final void setCapabilities(int);
+    method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
     method public final void setDisconnected(android.telecom.DisconnectCause);
     method public final void setOnHold();
   }
@@ -28270,6 +28273,7 @@ package android.telecom {
   public final class RemoteConference {
     method public void disconnect();
     method public final int getCallCapabilities();
+    method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
     method public final java.util.List<android.telecom.RemoteConnection> getConnections();
     method public android.telecom.DisconnectCause getDisconnectCause();
     method public final int getState();
@@ -28288,6 +28292,7 @@ package android.telecom {
   public static abstract class RemoteConference.Callback {
     ctor public RemoteConference.Callback();
     method public void onCapabilitiesChanged(android.telecom.RemoteConference, int);
+    method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);
     method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection);
     method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);
     method public void onDestroyed(android.telecom.RemoteConference);