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

Commit c1774583 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Disable in-band ringtone if HFP and HFPC are both connected" am: 4dae7ffb am: b8563b86 

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



Change-Id: Ibf0dc432f1a7bc042b511864f0c3e93320f3ffbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe354380 b8563b86

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+11 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import com.android.bluetooth.btservice.MetricsLogger; 
import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.hfpclient.HeadsetClientService;

import com.android.bluetooth.le_audio.LeAudioService;

import com.android.bluetooth.telephony.BluetoothInCallService;

import com.android.internal.annotations.VisibleForTesting;
@@ -1942,7 +1943,16 @@ public class HeadsetService extends ProfileService { 
        return isInbandRingingSupported && !SystemProperties.getBoolean(

                DISABLE_INBAND_RINGING_PROPERTY, false)

                && !mInbandRingingRuntimeDisable

                && inbandRingtoneAllowedByPolicy;

                && inbandRingtoneAllowedByPolicy

                && !isHeadsetClientConnected();

    }



    private boolean isHeadsetClientConnected() {

        HeadsetClientService headsetClientService = HeadsetClientService.getHeadsetClientService();

        if (headsetClientService == null) {

            return false;

        }

        return !(headsetClientService.getConnectedDevices().isEmpty());

    }



    /**