| commit | 78299e82e09a82b448d21fc1ffbe0ba31f6b2ee0 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Wed Nov 06 13:19:17 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 06 13:19:17 2019 -0800 |
| tree | 73018597a5fc3766dc13f91f5de5099d31942db7 | |
| parent | df10cb96a9e168fec4c99883998687bb6f81aea1 [diff] | |
| parent | 09613bd04a5b624429645afec1feabbfa4605016 [diff] |
Merge "Issue 128554727: no merge option when press merge and swap buttons simultaneously." am: eb0a870e45 am: 09613bd04a Change-Id: I8533b4012d80e22d06f84acf8c8293db21a6773c
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(); } /**