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

Commit 3e3cde1b authored by Ihab Awad's avatar Ihab Awad Committed by Android (Google) Code Review
Browse files

Merge "Refine implementation of GSM conferences (2/3)" into lmp-dev

parents 802363d9 60ccd779

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

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ final class ConnectionServiceWrapper extends ServiceBinder<IConnectionService> { 
        public void setConferenceableConnections(

                String callId, List<String> conferenceableCallIds) {

            logIncoming("setConferenceableConnections %s %s", callId, conferenceableCallIds);

            if (mCallIdMapper.isValidCallId(callId)) {

            if (mCallIdMapper.isValidCallId(callId) || mCallIdMapper.isValidConferenceId(callId)) {

                SomeArgs args = SomeArgs.obtain();

                args.arg1 = callId;

                args.arg2 = conferenceableCallIds;