From 6fb4366736fe6c5bb13ac437eb87f821326ffcbf Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Thu, 1 Jun 2023 14:49:21 +0200 Subject: [PATCH] AudioDeviceInventory: fix typo. commit ace96019 contained a typo a method name: AudioDeviceInventory.removePreferredDevicesForStrategyInt Bug: 284468571 Test: make Change-Id: Ia601f6f23dbc380c5af845472724d81686f0f4a8 --- .../core/java/com/android/server/audio/AudioDeviceBroker.java | 4 ++-- .../java/com/android/server/audio/AudioDeviceInventory.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index b86da88d15c34..1f8ff73b2d5d0 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -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 { diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index 7b2e732702a3b..d1cae490a31d4 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -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 */); }