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

Merge "AudioDeviceInventory: fix typo." into udc-dev am: 14338db145 am: 1c1622a868 am: a20e9aa577

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23515458

Change-Id: I9a08e2b956bfaf3c7861fac337bf846aa7d07484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Laurent
2023-06-02 14:48:06 +00:00
committed by Automerger Merge Worker
parent f62a8ec79e a20e9aa577
commit d9b2e2a324
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(
mAccessibilityStrategyId, Arrays.asList(defaultDevice));
} else {
mDeviceInventory.removePreferredDevicesForStrategInt(mCommunicationStrategyId);
mDeviceInventory.removePreferredDevicesForStrategInt(mAccessibilityStrategyId);
mDeviceInventory.removePreferredDevicesForStrategyInt(mCommunicationStrategyId);
mDeviceInventory.removePreferredDevicesForStrategyInt(mAccessibilityStrategyId);
}
mDeviceInventory.applyConnectedDevicesRoles();
} else {

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

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