am 8580679e: am 014e7fa2: Make Audio wakelock names less unique. (3278eed3) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+21 −2

Original line number	Diff line number	Diff line
		@@ -500,6 +500,25 @@ void AudioFlinger::ThreadBase::acquireWakeLock(int uid)
		acquireWakeLock_l(uid);
		}

		String16 AudioFlinger::ThreadBase::getWakeLockTag()
		{
		switch (mType) {
		case MIXER:
		return String16("AudioMix");
		case DIRECT:
		return String16("AudioDirectOut");
		case DUPLICATING:
		return String16("AudioDup");
		case RECORD:
		return String16("AudioIn");
		case OFFLOAD:
		return String16("AudioOffload");
		default:
		ALOG_ASSERT(false);
		return String16("AudioUnknown");
		}
		}

		void AudioFlinger::ThreadBase::acquireWakeLock_l(int uid)
		{
		if (mPowerManager == 0) {
		@@ -519,13 +538,13 @@ void AudioFlinger::ThreadBase::acquireWakeLock_l(int uid)
		if (uid >= 0) {
		status = mPowerManager->acquireWakeLockWithUid(POWERMANAGER_PARTIAL_WAKE_LOCK,
		binder,
		String16(mName),
		getWakeLockTag(),
		String16("media"),
		uid);
		} else {
		status = mPowerManager->acquireWakeLock(POWERMANAGER_PARTIAL_WAKE_LOCK,
		binder,
		String16(mName),
		getWakeLockTag(),
		String16("media"));
		}
		if (status == NO_ERROR) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,8 @@ protected:
		// check if some effects must be suspended when an effect chain is added
		void checkSuspendOnAddEffectChain_l(const sp<EffectChain>& chain);

		String16 getWakeLockTag();

		virtual void preExit() { }

		friend class AudioFlinger; // for mEffectChains