am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

* commit '235f60bc134646d1ce18ab872b982ff63b14845e':
  Fixing conference merge where only one party is added to conference.

2 files changed, 11 insertions, 0 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index 56edc72..d84b1dc 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30037,6 +30037,7 @@ package android.telecom {
     method public final int getState();
     method public final android.telecom.StatusHints getStatusHints();
     method public final boolean isRingbackRequested();
+    method protected void notifyConferenceStarted();
     method public void onAbort();
     method public void onAnswer();
     method public void onAudioStateChanged(android.telecom.AudioState);
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index a180f44..03fec01 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -260,6 +260,7 @@ public abstract class Connection implements IConferenceable {
         /** @hide */
         public void onConferenceParticipantsChanged(Connection c,
                 List<ConferenceParticipant> participants) {}
+        public void onConferenceStarted() {}
     }
 
     /** @hide */
@@ -1422,4 +1423,13 @@ public abstract class Connection implements IConferenceable {
             l.onConferenceParticipantsChanged(this, conferenceParticipants);
         }
     }
+
+    /**
+     * Notifies listeners that a conference call has been started.
+     */
+    protected void notifyConferenceStarted() {
+        for (Listener l : mListeners) {
+            l.onConferenceStarted();
+        }
+    }
 }