am 21e54568: fix incoming call audio start time. (3f1d3b97) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioPolicyService.cpp

+10 −9

Original line number	Diff line number	Diff line
		@@ -975,7 +975,6 @@ void AudioPolicyService::AudioCommandThread::insertCommand_l(AudioCommand *comma
		{
		ssize_t i; // not size_t because i will count down to -1
		Vector <AudioCommand *> removedCommands;
		nsecs_t time = 0;
		command->mTime = systemTime() + milliseconds(delayMs);

		// acquire wake lock to make sure delayed commands are processed
		@@ -1021,7 +1020,10 @@ void AudioPolicyService::AudioCommandThread::insertCommand_l(AudioCommand *comma
		} else {
		data2->mKeyValuePairs = param2.toString();
		}
		time = command2->mTime;
		command->mTime = command2->mTime;
		// force delayMs to non 0 so that code below does not request to wait for
		// command status as the command is now delayed
		delayMs = 1;
		} break;

		case SET_VOLUME: {
		@@ -1032,7 +1034,10 @@ void AudioPolicyService::AudioCommandThread::insertCommand_l(AudioCommand *comma
		ALOGV("Filtering out volume command on output %d for stream %d",
		data->mIO, data->mStream);
		removedCommands.add(command2);
		time = command2->mTime;
		command->mTime = command2->mTime;
		// force delayMs to non 0 so that code below does not request to wait for
		// command status as the command is now delayed
		delayMs = 1;
		} break;
		case START_TONE:
		case STOP_TONE:
		@@ -1054,16 +1059,12 @@ void AudioPolicyService::AudioCommandThread::insertCommand_l(AudioCommand *comma
		}
		removedCommands.clear();

		// wait for status only if delay is 0 and command time was not modified above
		if (delayMs == 0 && time == 0) {
		// wait for status only if delay is 0
		if (delayMs == 0) {
		command->mWaitStatus = true;
		} else {
		command->mWaitStatus = false;
		}
		// update command time if modified above
		if (time != 0) {
		command->mTime = time;
		}

		// insert command at the right place according to its time stamp
		ALOGV("inserting command: %d at index %d, num commands %d",