| commit | f6cf2b5bd0fa487175d7ed0e5f121abef3603591 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Nov 10 16:25:00 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 10 16:25:00 2015 +0000 |
| tree | cfdbeb4ed1e362aa8886cfcc9a4d7d808399b47a | |
| parent | 53aa207a6e5a46ec528e056752025b1e9bed56ad [diff] | |
| parent | 97a1bc89c86641fc1365624a78612873449bc804 [diff] |
Merge "IMS: Merge calls option not seen when refer failed"
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java index febb7eb..a629a5d 100644 --- a/src/com/android/services/telephony/ImsConferenceController.java +++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -76,7 +76,7 @@ @Override public void onConferenceStarted() { Log.v(this, "onConferenceStarted"); - recalculateConference(); + recalculate(); } };