PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass in active device to all BluetoothA2dp APIs in

Browse Source 
packages/apps/Settings as null input is no longer supported

Bug: 147287141
Test: Manual
Change-Id: If43934374914c657080ffd0509f8095d988cc550
This commit is contained in:
Rahul Sabnis
2020-02-03 18:22:54 -08:00
parent 3c77bd3631
commit dcedd7d6f5
11 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
View File

@@ -83,7 +83,7 @@ public abstract class AbstractBluetoothA2dpPreferenceController extends
final BluetoothCodecConfig codecConfig = mBluetoothA2dpConfigStore.createCodecConfig();
synchronized (mBluetoothA2dpConfigStore) {
if (mBluetoothA2dp != null) {
setCodecConfigPreference(null, codecConfig); // Use current active device
setCodecConfigPreference(mBluetoothA2dp.getActiveDevice(), codecConfig);
}
}
// Because the setting is not persisted into permanent storage, we cannot call update state
@@ -102,13 +102,14 @@ public abstract class AbstractBluetoothA2dpPreferenceController extends
@Override
public void updateState(Preference preference) {
if (getCodecConfig(null) == null || mPreference == null) { // Use current active device
BluetoothDevice activeDevice = mBluetoothA2dp.getActiveDevice();
if (getCodecConfig(activeDevice) == null || mPreference == null) {
return;
}
BluetoothCodecConfig codecConfig;
synchronized (mBluetoothA2dpConfigStore) {
codecConfig = getCodecConfig(null); // Use current active device
codecConfig = getCodecConfig(activeDevice);
}
final int index = getCurrentA2dpSettingIndex(codecConfig);