diff options
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioDeviceInventory.java | 16 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 8 |
2 files changed, 4 insertions, 20 deletions
diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index a1d2e1412777..d7076899fcb6 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -924,9 +924,6 @@ public class AudioDeviceInventory { @NonNull List<AudioDeviceAttributes> devices) { int status = AudioSystem.ERROR; try (SafeCloseable ignored = ClearCallingIdentityContext.create()) { - AudioService.sDeviceLogger.enqueue((new EventLogger.StringEvent( - "setPreferredDevicesForStrategy, strategy: " + strategy - + " devices: " + devices)).printLog(TAG)); status = setDevicesRoleForStrategy( strategy, AudioSystem.DEVICE_ROLE_PREFERRED, devices, false /* internal */); } @@ -952,10 +949,6 @@ public class AudioDeviceInventory { int status = AudioSystem.ERROR; try (SafeCloseable ignored = ClearCallingIdentityContext.create()) { - AudioService.sDeviceLogger.enqueue((new EventLogger.StringEvent( - "removePreferredDevicesForStrategy, strategy: " - + strategy)).printLog(TAG)); - status = clearDevicesRoleForStrategy( strategy, AudioSystem.DEVICE_ROLE_PREFERRED, false /*internal */); } @@ -974,10 +967,6 @@ public class AudioDeviceInventory { try (SafeCloseable ignored = ClearCallingIdentityContext.create()) { List<AudioDeviceAttributes> devices = new ArrayList<>(); devices.add(device); - - AudioService.sDeviceLogger.enqueue((new EventLogger.StringEvent( - "setDeviceAsNonDefaultForStrategyAndSave, strategy: " + strategy - + " device: " + device)).printLog(TAG)); status = addDevicesRoleForStrategy( strategy, AudioSystem.DEVICE_ROLE_DISABLED, devices, false /* internal */); } @@ -995,11 +984,6 @@ public class AudioDeviceInventory { try (SafeCloseable ignored = ClearCallingIdentityContext.create()) { List<AudioDeviceAttributes> devices = new ArrayList<>(); devices.add(device); - - AudioService.sDeviceLogger.enqueue((new EventLogger.StringEvent( - "removeDeviceAsNonDefaultForStrategyAndSave, strategy: " - + strategy + " devices: " + device)).printLog(TAG)); - status = removeDevicesRoleForStrategy( strategy, AudioSystem.DEVICE_ROLE_DISABLED, devices, false /* internal */); } diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 9b03afbcc569..b1c6514f0b50 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -2921,11 +2921,11 @@ public class AudioService extends IAudioService.Stub super.removePreferredDevicesForStrategy_enforcePermission(); final String logString = - String.format("removePreferredDeviceForStrategy strat:%d", strategy); + String.format("removePreferredDevicesForStrategy strat:%d", strategy); sDeviceLogger.enqueue(new EventLogger.StringEvent(logString).printLog(TAG)); final int status = mDeviceBroker.removePreferredDevicesForStrategySync(strategy); - if (status != AudioSystem.SUCCESS) { + if (status != AudioSystem.SUCCESS && status != AudioSystem.BAD_VALUE) { Log.e(TAG, String.format("Error %d in %s)", status, logString)); } return status; @@ -3009,7 +3009,7 @@ public class AudioService extends IAudioService.Stub } final int status = mDeviceBroker.removeDeviceAsNonDefaultForStrategySync(strategy, device); - if (status != AudioSystem.SUCCESS) { + if (status != AudioSystem.SUCCESS && status != AudioSystem.BAD_VALUE) { Log.e(TAG, String.format("Error %d in %s)", status, logString)); } return status; @@ -3129,7 +3129,7 @@ public class AudioService extends IAudioService.Stub sDeviceLogger.enqueue(new EventLogger.StringEvent(logString).printLog(TAG)); final int status = mDeviceBroker.clearPreferredDevicesForCapturePresetSync(capturePreset); - if (status != AudioSystem.SUCCESS) { + if (status != AudioSystem.SUCCESS && status != AudioSystem.BAD_VALUE) { Log.e(TAG, String.format("Error %d in %s", status, logString)); } return status; |