audioflinger: don't do work in constructor, instead do it in onFirstRef (5a61d2f2) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+13 −2

Original line number	Diff line number	Diff line
		@@ -171,6 +171,10 @@ static const char *audio_interfaces[] = {
		AudioFlinger::AudioFlinger()
		: BnAudioFlinger(),
		mPrimaryHardwareDev(0), mMasterVolume(1.0f), mMasterMute(false), mNextUniqueId(1)
		{
		}

		void AudioFlinger::onFirstRef()
		{
		int rc = 0;

		@@ -194,8 +198,7 @@ AudioFlinger::AudioFlinger()
		if (!mPrimaryHardwareDev) {
		mPrimaryHardwareDev = dev;
		LOGI("Using '%s' (%s.%s) as the primary audio interface",
		AUDIO_HARDWARE_INTERFACE, mod->name, mod->id,
		audio_interfaces[i]);
		mod->name, mod->id, audio_interfaces[i]);
		}
		}

		@@ -224,6 +227,14 @@ AudioFlinger::AudioFlinger()
		}
		}

		status_t AudioFlinger::initCheck() const
		{
		Mutex::Autolock _l(mLock);
		if (mPrimaryHardwareDev == NULL \|\| mAudioHwDevs.size() == 0)
		return NO_INIT;
		return NO_ERROR;
		}

		AudioFlinger::~AudioFlinger()
		{
		int num_devs = mAudioHwDevs.size();

+2 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,8 @@ private:
		AudioFlinger();
		virtual ~AudioFlinger();

		status_t initCheck() const;
		virtual void onFirstRef();
		audio_hw_device_t* findSuitableHwDev_l(uint32_t devices);

		// Internal dump utilites.