am cd90d42d: am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev

automerge: aec33e6 * commit 'aec33e66acbcf83a58b0e7af14c6330f48063bf8': Fire onConferenceChanged after reseting conference.
2014-10-21 23:33:50 +00:00
parent e0da8accd0 aec33e66ac
commit 013ccb6430
1 changed files with 1 additions and 0 deletions
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -927,6 +927,7 @@ public abstract class Connection {
            Log.d(this, "Conference reset");
            mConference = null;
            fireConferenceChanged();
+            onConferenceChanged();
        }
    }