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

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

Merge "BluetoothInCallService: Release the parent call if there is a... 

Merge "BluetoothInCallService: Release the parent call if there is a conference call" am: 6aff97f3 am: 909595cd am: dfb95b90

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

Change-Id: Iaf14987f1237f1d85454123b03b975cfffc7cdab
parents 46dcd46a dfb95b90

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -349,6 +349,13 @@ public class BluetoothInCallService extends InCallService { 
            if (mCallInfo.isNullCall(call)) {

            if (mCallInfo.isNullCall(call)) {

                return false;

                return false;

            }

            }

            // release the parent if there is a conference call

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

            if (!mCallInfo.isNullCall(conferenceCall)

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

                Log.i(TAG, "BT - hanging up conference call");

                call = conferenceCall;

            }

            call.disconnect();

            call.disconnect();

            return true;

            return true;

        }

        }