Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6d5418 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix disabled merge button on conference failure."

parents f202c697 3b097026
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -339,6 +339,9 @@ final class ConnectionServiceWrapper extends ServiceBinder {
                            // the failure event all the way to InCallUI instead of stopping
                            // it here. That way we can also handle the UI of notifying that
                            // the merged has failed.
                            Bundle extras = call.getExtras();
                            extras.putInt("MergeFail", new java.util.Random().nextInt());
                            call.setExtras(extras);
                            mCallsManager.onMergeFailed(call);
                        } else {
                            Log.w(this, "setConferenceMergeFailed, unknown call id: %s", callId);