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

Replacing getActiveDevice by btAdapter.getActiveDevices()

Browse Source 
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.

Tag: #feature
Bug: 200202780
Test: build
Change-Id: Id18658de82a7e8292942951a3832a36465a69da3
This commit is contained in:
Etienne Ruffieux
2022-02-01 17:08:15 +00:00
parent dac3f891ae
commit 9692c59d3a
13 changed files with 119 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
View File

@@ -17,8 +17,14 @@
package com.android.settings.development.bluetooth;
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothManager;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import androidx.annotation.VisibleForTesting;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.development.BluetoothA2dpConfigStore;
import com.android.settings.development.BluetoothServiceConnectionListener;
@@ -27,6 +33,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnDestroy;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import java.util.List;
/**
* Abstract class for Bluetooth A2DP config controller in developer option.
*/
@@ -36,12 +44,16 @@ public abstract class AbstractBluetoothPreferenceController extends
protected volatile BluetoothA2dp mBluetoothA2dp;
@VisibleForTesting
BluetoothAdapter mBluetoothAdapter;
public AbstractBluetoothPreferenceController(Context context, Lifecycle lifecycle,
BluetoothA2dpConfigStore store) {
super(context);
if (lifecycle != null) {
lifecycle.addObserver(this);
}
mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
}
@Override
@@ -82,4 +94,13 @@ public abstract class AbstractBluetoothPreferenceController extends
*/
void onBluetoothHDAudioEnabled(boolean enabled);
}
protected BluetoothDevice getA2dpActiveDevice() {
if (mBluetoothAdapter == null) {
return null;
}
List<BluetoothDevice> activeDevices =
mBluetoothAdapter.getActiveDevices(BluetoothProfile.A2DP);
return (activeDevices.size() > 0) ? activeDevices.get(0) : null;
}
}