Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev (6405b602) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -5361,6 +5361,11 @@ public class AudioService extends IAudioService.Stub
		}
		}

		private static final int DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG =
		AudioSystem.DEVICE_OUT_WIRED_HEADSET \| AudioSystem.DEVICE_OUT_WIRED_HEADPHONE \|
		AudioSystem.DEVICE_OUT_LINE \|
		AudioSystem.DEVICE_OUT_ALL_USB;

		private void onSetWiredDeviceConnectionState(int device, int state, String address,
		String deviceName, String caller) {
		if (DEBUG_DEVICES) {
		@@ -5372,9 +5377,7 @@ public class AudioService extends IAudioService.Stub
		}

		synchronized (mConnectedDevices) {
		if ((state == 0) && ((device == AudioSystem.DEVICE_OUT_WIRED_HEADSET) \|\|
		(device == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE) \|\|
		(device == AudioSystem.DEVICE_OUT_LINE))) {
		if ((state == 0) && ((device & DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG) != 0)) {
		setBluetoothA2dpOnInt(true);
		}
		boolean isUsb = ((device & ~AudioSystem.DEVICE_OUT_ALL_USB) == 0) \|\|
		@@ -5385,9 +5388,7 @@ public class AudioService extends IAudioService.Stub
		return;
		}
		if (state != 0) {
		if ((device == AudioSystem.DEVICE_OUT_WIRED_HEADSET) \|\|
		(device == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE) \|\|
		(device == AudioSystem.DEVICE_OUT_LINE)) {
		if ((device & DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG) != 0) {
		setBluetoothA2dpOnInt(false);
		}
		if ((device & mSafeMediaVolumeDevices) != 0) {