Merge "audiopolicy: send device connect notification to HALs" (5bb026d2) · Commits · e / os / android_frameworks_av

services/audiopolicy/AudioPolicyManager.cpp

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -265,6 +265,7 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
	const char *device_address)		const char *device_address)
	{		{
	String8 address = (device_address == NULL) ? String8("") : String8(device_address);		String8 address = (device_address == NULL) ? String8("") : String8(device_address);
			AudioParameter param;

	ALOGV("setDeviceConnectionState() device: %x, state %d, address %s",		ALOGV("setDeviceConnectionState() device: %x, state %d, address %s",
	device, state, address.string());		device, state, address.string());
	@@ -340,6 +341,13 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
	"checkOutputsForDevice() returned no outputs but status OK");		"checkOutputsForDevice() returned no outputs but status OK");
	ALOGV("setDeviceConnectionState() checkOutputsForDevice() returned %zu outputs",		ALOGV("setDeviceConnectionState() checkOutputsForDevice() returned %zu outputs",
	outputs.size());		outputs.size());


			// Set connect to HALs
			param = AudioParameter(address);
			param.addInt(String8(AUDIO_PARAMETER_DEVICE_CONNECT), device);
			mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());

	break;		break;
	// handle output device disconnection		// handle output device disconnection
	case AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE: {		case AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE: {
	@@ -360,7 +368,7 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
	ALOGV("setDeviceConnectionState() disconnecting output device %x", device);		ALOGV("setDeviceConnectionState() disconnecting output device %x", device);

	// Set Disconnect to HALs		// Set Disconnect to HALs
	AudioParameter param = AudioParameter(address);		param = AudioParameter(address);
	param.addInt(String8(AUDIO_PARAMETER_DEVICE_DISCONNECT), device);		param.addInt(String8(AUDIO_PARAMETER_DEVICE_DISCONNECT), device);
	mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());		mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());

	@@ -477,6 +485,12 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
	} else {		} else {
	return NO_MEMORY;		return NO_MEMORY;
	}		}

			// Set connect to HALs
			param = AudioParameter(address);
			param.addInt(String8(AUDIO_PARAMETER_DEVICE_CONNECT), device);
			mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());

	} break;		} break;

	// handle input device disconnection		// handle input device disconnection
	@@ -489,7 +503,7 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
	ALOGV("setDeviceConnectionState() disconnecting input device %x", device);		ALOGV("setDeviceConnectionState() disconnecting input device %x", device);

	// Set Disconnect to HALs		// Set Disconnect to HALs
	AudioParameter param = AudioParameter(address);		param = AudioParameter(address);
	param.addInt(String8(AUDIO_PARAMETER_DEVICE_DISCONNECT), device);		param.addInt(String8(AUDIO_PARAMETER_DEVICE_DISCONNECT), device);
	mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());		mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());