Merge "audiopolicy: increase binder command timeout for some commmands" into pi-dev (ed457786) · Commits · e / os / android_frameworks_av

media/libaudioclient/IAudioPolicyService.cpp

+14 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,20 @@ status_t BnAudioPolicyService::onTransact(
		break;
		}

		TimeCheck check("IAudioPolicyService");
		// FIXME: extend timeout for SET_DEVICE_CONNECTION_STATE and HANDLE_DEVICE_CONFIG_CHANGE
		// while we investigate why BT A2DP device connection/disconnection can sometimes
		// take more than 5 seconds
		uint32_t timeoutMs = TimeCheck::kDefaultTimeOutMs;
		switch (code) {
		case SET_DEVICE_CONNECTION_STATE:
		case HANDLE_DEVICE_CONFIG_CHANGE:
		timeoutMs *= 2;
		break;
		default:
		break;
		}

		TimeCheck check("IAudioPolicyService", timeoutMs);

		switch (code) {
		case SET_DEVICE_CONNECTION_STATE: {