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

Commit c8c98905 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "remove the ConferenceCallInference flag and turn on inference by... 

Merge "remove the ConferenceCallInference flag and turn on inference by default" into main am: d2e72de6

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



Change-Id: I217114e9106e0ac3553c486a88088209303e55d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 605509d6 d2e72de6

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

+2 −8
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ import java.util.concurrent.Executors; 
public class BluetoothInCallService extends InCallService {



    private static final String TAG = "BluetoothInCallService";

    @VisibleForTesting static final String CLCC_INFERENCE = "ConferenceCallInference";



    // match up with bthf_call_state_t of bt_hf.h

    private static final int CALL_STATE_ACTIVE = 0;

    private static final int CALL_STATE_HELD = 1;
@@ -750,16 +748,12 @@ public class BluetoothInCallService extends InCallService { 


    private void sendListOfCalls(boolean shouldLog) {

        Collection<BluetoothCall> calls = mCallInfo.getBluetoothCalls();

        boolean isInferenceEnabled =

                DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, CLCC_INFERENCE, false);

        Log.d(TAG, "is conference call inference enabled: " + isInferenceEnabled);



        // either do conference call CLCC index inference or normal conference call

        BluetoothCall conferenceCallChildrenNotReady = null;

        for (BluetoothCall call : calls) {

            // find the conference call parent among calls

            if (isInferenceEnabled

                    && call.isConference()

                    && !mBluetoothConferenceCallInference.isEmpty()) {

            if (call.isConference() && !mBluetoothConferenceCallInference.isEmpty()) {

                Log.d(

                        TAG,

                        "conference call inferred size: "

android/app/tests/unit/src/com/android/bluetooth/telephony/BluetoothInCallServiceTest.java

+0 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.bluetooth.telephony;



import static com.android.bluetooth.telephony.BluetoothInCallService.CLCC_INFERENCE;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.*;
@@ -818,7 +817,6 @@ public class BluetoothInCallServiceTest { 


    @Test

    public void testListCurrentCallsConferenceEmptyChildrenInference() throws Exception {

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH, CLCC_INFERENCE, "true", false);

        mBluetoothInCallService.mTelephonyManager = mMockTelephonyManager;

        when(mMockTelephonyManager.getNetworkCountryIso()).thenReturn("");
@@ -952,8 +950,6 @@ public class BluetoothInCallServiceTest { 
                        anyBoolean(),

                        nullable(String.class),

                        anyInt());



        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BLUETOOTH, CLCC_INFERENCE, "false", false);

    }



    @Test