commit cf4d1335a76296a2b1cc3880198d3d28c13924bd
author Andrew Lee <anwlee@google.com> Fri Nov 07 01:54:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 07 01:54:14 2014 +0000
tree ce6cbbdcf0b6e86c05b5333daa7e04e384b2ef73
parent 0348766dac5e533767e77072e1c6ffa6742e44d5
parent 09bb16f9d7e4ffa790132285d9e8583ebe4af0fe

Merge "Disable MANAGE_CONFERENCE in TelephonyConference." into lmp-mr1-dev

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index ba9f96d..da3de63 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -841,6 +841,11 @@
      */
     public final TelephonyConnection addTelephonyConnectionListener(TelephonyConnectionListener l) {
         mTelephonyListeners.add(l);
+        // If we already have an original connection, let's call back immediately.
+        // This would be the case for incoming calls.
+        if (mOriginalConnection != null) {
+            fireOnOriginalConnectionConfigured();
+        }
         return this;
     }