Merge "AudioService: device connection intent: never send null action am:... (f30b3cfa) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -5470,6 +5470,10 @@ public class AudioService extends IAudioService.Stub
		configureHdmiPlugIntent(intent, state);
		}

		if (intent.getAction() == null) {
		return;
		}

		intent.putExtra(CONNECT_INTENT_KEY_STATE, state);
		intent.putExtra(CONNECT_INTENT_KEY_ADDRESS, address);
		intent.putExtra(CONNECT_INTENT_KEY_PORT_NAME, deviceName);
		@@ -5543,9 +5547,7 @@ public class AudioService extends IAudioService.Stub
		}
		}
		}
		if (device != AudioSystem.DEVICE_IN_WIRED_HEADSET) {
		sendDeviceConnectionIntent(device, state, address, deviceName);
		}
		updateAudioRoutes(device, state);
		}
		}