| commit | acd06b4e9ea1b0b0215ea1bde5145a22dc7f15ca | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Wed Nov 06 13:27:11 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 06 13:27:11 2019 -0800 |
| tree | e64590b554110c0979b0a46d3abeae64aca11b52 | |
| parent | 06533ae2756e39f66884e8006c0540b005e88d4b [diff] | |
| parent | 78299e82e09a82b448d21fc1ffbe0ba31f6b2ee0 [diff] |
Merge "Issue 128554727: no merge option when press merge and swap buttons simultaneously." am: eb0a870e45 am: 09613bd04a am: 78299e82e0 Change-Id: Idddb9ec29f55f9e1ad0e461276afd459f165e821
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java index 315aaad..b7f7b92 100644 --- a/src/com/android/services/telephony/ImsConferenceController.java +++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -147,6 +147,7 @@ mTelephonyConnections.add(connection); connection.addTelephonyConnectionListener(mTelephonyConnectionListener); recalculateConference(); + recalculateConferenceable(); } /**