Merge "AudioService: fix devices for strategy APIs log" into main (308f7866) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -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 */);
		}

services/core/java/com/android/server/audio/AudioService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -2936,11 +2936,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;
		@@ -3024,7 +3024,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;
		@@ -3144,7 +3144,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;