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

Commit ee3dafa6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BluetoothInCallService: check the parent ID to disconnect a conference... 

Merge "BluetoothInCallService: check the parent ID to disconnect a conference call" am: d50b8055 am: c2f05a51

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1772390

Change-Id: Ib646b45814c57350a38cd96580515c6a99f07119
parents bafb63c3 c2f05a51

android/app/src/com/android/bluetooth/telephony/BluetoothInCallService.java

+7 −4
Original line number Original line Diff line number Diff line
@@ -736,11 +736,14 @@ public class BluetoothInCallService extends InCallService { 
                return false;

                return false;

            }

            }

            if (!mCallInfo.isNullCall(activeCall)) {

            if (!mCallInfo.isNullCall(activeCall)) {

                BluetoothCall conferenceCall = getBluetoothCallById(activeCall.getParentId());

                if (!mCallInfo.isNullCall(conferenceCall)

                        && conferenceCall.getState() == Call.STATE_ACTIVE) {

                    Log.i(TAG, "CHLD: disconnect conference call");

                    conferenceCall.disconnect();

                } else {

                    activeCall.disconnect();

                    activeCall.disconnect();

                if (!mCallInfo.isNullCall(ringingCall)) {

                    ringingCall.answer(VideoProfile.STATE_AUDIO_ONLY);

                }

                }

                return true;

            }

            }

            if (!mCallInfo.isNullCall(ringingCall)) {

            if (!mCallInfo.isNullCall(ringingCall)) {

                ringingCall.answer(ringingCall.getVideoState());

                ringingCall.answer(ringingCall.getVideoState());