Merge "Fix NPE when trying to get input device for attributes." into qt-dev (486194f7) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -1900,12 +1900,16 @@ sp<media::IAudioRecord> AudioFlinger::createRecord(const CreateRecordInput& inpu
		input.opPackageName,
		&input.config,
		output.flags, &output.selectedDeviceId, &portId);
		if (lStatus != NO_ERROR) {
		ALOGE("createRecord() getInputForAttr return error %d", lStatus);
		goto Exit;
		}

		{
		Mutex::Autolock _l(mLock);
		RecordThread *thread = checkRecordThread_l(output.inputId);
		if (thread == NULL) {
		ALOGE("createRecord() checkRecordThread_l failed");
		ALOGE("createRecord() checkRecordThread_l failed, input handle %d", output.inputId);
		lStatus = BAD_VALUE;
		goto Exit;
		}

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+18 −11

Original line number	Diff line number	Diff line
		@@ -1991,16 +1991,25 @@ status_t AudioPolicyManager::getInputForAttr(const audio_attributes_t *attr,
		strncmp(attributes.tags, "addr=", strlen("addr=")) == 0) {
		status = mPolicyMixes.getInputMixForAttr(attributes, &policyMix);
		if (status != NO_ERROR) {
		ALOGW("%s could not find input mix for attr %s",
		__func__, toString(attributes).c_str());
		goto error;
		}
		device = mAvailableInputDevices.getDevice(AUDIO_DEVICE_IN_REMOTE_SUBMIX,
		String8(attr->tags + strlen("addr=")),
		AUDIO_FORMAT_DEFAULT);
		if (device == nullptr) {
		ALOGW("%s could not find device for source %d, tags %s",
		__func__, attributes.source, attributes.tags);
		status = BAD_VALUE;
		goto error;
		}

		if (is_mix_loopback_render(policyMix->mRouteFlags)) {
		*inputType = API_INPUT_MIX_PUBLIC_CAPTURE_PLAYBACK;
		} else {
		*inputType = API_INPUT_MIX_EXT_POLICY_REROUTE;
		}
		device = mAvailableInputDevices.getDevice(AUDIO_DEVICE_IN_REMOTE_SUBMIX,
		String8(attr->tags + strlen("addr=")),
		AUDIO_FORMAT_DEFAULT);
		} else {
		if (explicitRoutingDevice != nullptr) {
		device = explicitRoutingDevice;
		@@ -2867,14 +2876,12 @@ status_t AudioPolicyManager::registerPolicyMixes(const Vector<AudioMix>& mixes)
		rSubmixModule->addInputProfile(address, &inputConfig,
		AUDIO_DEVICE_IN_REMOTE_SUBMIX, address);

		if (mix.mMixType == MIX_TYPE_PLAYERS) {
		setDeviceConnectionStateInt(AUDIO_DEVICE_IN_REMOTE_SUBMIX,
		if ((res = setDeviceConnectionStateInt(mix.mDeviceType,
		AUDIO_POLICY_DEVICE_STATE_AVAILABLE,
		address.string(), "remote-submix", AUDIO_FORMAT_DEFAULT);
		} else {
		setDeviceConnectionStateInt(AUDIO_DEVICE_OUT_REMOTE_SUBMIX,
		AUDIO_POLICY_DEVICE_STATE_AVAILABLE,
		address.string(), "remote-submix", AUDIO_FORMAT_DEFAULT);
		address.string(), "remote-submix", AUDIO_FORMAT_DEFAULT)) != NO_ERROR) {
		ALOGE("Failed to set remote submix device available, type %u, address %s",
		mix.mDeviceType, address.string());
		break;
		}
		} else if ((mix.mRouteFlags & MIX_ROUTE_FLAG_RENDER) == MIX_ROUTE_FLAG_RENDER) {
		String8 address = mix.mDeviceAddress;