Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch the audio path from the settings during the call, and the music will be transferred to the DUT at the end of the call" into sc-v2-dev

Browse Source
This commit is contained in:
tim peng
2021-11-09 07:58:48 +00:00
committed by Android (Google) Code Review
parent 32438ace61 f0c9f0b62f
commit 4cf0808c35
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java
View File

@@ -16,7 +16,8 @@
package com.android.settingslib.bluetooth; package com.android.settingslib.bluetooth;
import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_ALL; import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_AUDIO;
import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_PHONE_CALL;
import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED;
import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
@@ -29,6 +30,7 @@ import android.content.Context;
import android.util.Log; import android.util.Log;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.Utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -162,9 +164,12 @@ public class HearingAidProfile implements LocalBluetoothProfile {
if (mBluetoothAdapter == null) { if (mBluetoothAdapter == null) {
return false; return false;
} }
int profiles = Utils.isAudioModeOngoingCall(mContext)
? ACTIVE_DEVICE_PHONE_CALL
: ACTIVE_DEVICE_AUDIO;
return device == null return device == null
? mBluetoothAdapter.removeActiveDevice(ACTIVE_DEVICE_ALL) ? mBluetoothAdapter.removeActiveDevice(profiles)
: mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_ALL); : mBluetoothAdapter.setActiveDevice(device, profiles);
} }
public List<BluetoothDevice> getActiveDevices() { public List<BluetoothDevice> getActiveDevices() {