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

Merge "AudioDeviceInventory: fix typo." into udc-dev

Browse Source
This commit is contained in:
Eric Laurent
2023-06-01 15:29:00 +00:00
committed by Android (Google) Code Review
parent c3aa90852e 6fb4366736
commit 14338db145
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/audio/AudioDeviceBroker.java
View File

@@ -2210,8 +2210,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
mDeviceInventory.setPreferredDevicesForStrategyInt( mDeviceInventory.setPreferredDevicesForStrategyInt(
mAccessibilityStrategyId, Arrays.asList(defaultDevice)); mAccessibilityStrategyId, Arrays.asList(defaultDevice));
} else { } else {
mDeviceInventory.removePreferredDevicesForStrategInt(mCommunicationStrategyId); mDeviceInventory.removePreferredDevicesForStrategyInt(mCommunicationStrategyId);
mDeviceInventory.removePreferredDevicesForStrategInt(mAccessibilityStrategyId); mDeviceInventory.removePreferredDevicesForStrategyInt(mAccessibilityStrategyId);
} }
mDeviceInventory.applyConnectedDevicesRoles(); mDeviceInventory.applyConnectedDevicesRoles();
} else { } else {

2
services/core/java/com/android/server/audio/AudioDeviceInventory.java
View File

@@ -823,7 +823,7 @@ public class AudioDeviceInventory {
return status; return status;
} }
// Only used for internal requests // Only used for internal requests
/*package*/ int removePreferredDevicesForStrategInt(int strategy) { /*package*/ int removePreferredDevicesForStrategyInt(int strategy) {
return clearDevicesRoleForStrategy( return clearDevicesRoleForStrategy(
strategy, AudioSystem.DEVICE_ROLE_PREFERRED, true /*internal */); strategy, AudioSystem.DEVICE_ROLE_PREFERRED, true /*internal */);
} }