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

Merge "Fix incorrect logic to now use a passed in BluetoothDevice when it's not null, not when it's null in A2dpProfile.java" into rvc-dev am: ef2267027c

Browse Source 
Change-Id: Id8a970094846b66571c24a4c46fb1c404f14938d
This commit is contained in:
Automerger Merge Worker
2020-03-16 18:26:19 +00:00
parent 344d41348c ef2267027c
commit 4fc9764b2d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
View File

@@ -218,7 +218,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
} }
public boolean supportsHighQualityAudio(BluetoothDevice device) { public boolean supportsHighQualityAudio(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device == null) ? device : mService.getActiveDevice(); BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();
if (bluetoothDevice == null) { if (bluetoothDevice == null) {
return false; return false;
} }
@@ -227,7 +227,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
} }
public boolean isHighQualityAudioEnabled(BluetoothDevice device) { public boolean isHighQualityAudioEnabled(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device == null) ? device : mService.getActiveDevice(); BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();
if (bluetoothDevice == null) { if (bluetoothDevice == null) {
return false; return false;
} }
@@ -253,7 +253,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
} }
public void setHighQualityAudioEnabled(BluetoothDevice device, boolean enabled) { public void setHighQualityAudioEnabled(BluetoothDevice device, boolean enabled) {
BluetoothDevice bluetoothDevice = (device == null) ? device : mService.getActiveDevice(); BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();
if (bluetoothDevice == null) { if (bluetoothDevice == null) {
return; return;
} }
@@ -272,7 +272,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
} }
public String getHighQualityAudioOptionLabel(BluetoothDevice device) { public String getHighQualityAudioOptionLabel(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device == null) ? device : mService.getActiveDevice(); BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();
int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec; int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec;
if (bluetoothDevice == null || !supportsHighQualityAudio(device) if (bluetoothDevice == null || !supportsHighQualityAudio(device)
|| getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) { || getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) {