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

Commit 3b097026 authored by Shriram Ganesh's avatar Shriram Ganesh Committed by Gerrit - the friendly Code Review server
Browse files

Fix disabled merge button on conference failure. 

There is currently no direct plumbing of the conference failure
to InCallUI. Instead it depends on the capabilities refresh.
In the conference failure scenario, there is no such change
and as a result the merge button remains greyed out until a
subsequent update using state or extras. The fix here is to
create a dummy extra to refresh the UI.

Change-Id: Id487418aa4729f822ba0a19661805e1bf3ccbb6a
CRs-Fixed: 931958
parent 8251213a

src/com/android/server/telecom/ConnectionServiceWrapper.java

+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);