Merge "Disable media.log until service is ready" (54cac516) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+11 −10

Original line number	Diff line number	Diff line
		@@ -185,8 +185,8 @@ AudioFlinger::AudioFlinger()
		mSystemReady(false)
		{
		getpid_cached = getpid();
		char value[PROPERTY_VALUE_MAX];
		bool doLog = (property_get("ro.test_harness", value, "0") > 0) && (atoi(value) == 1);
		// disable media.log until the service is reenabled, see b/26306954
		const bool doLog = false; // property_get_bool("ro.test_harness", false);
		if (doLog) {
		mLogMemoryDealer = new MemoryDealer(kLogMemorySize, "LogWriters",
		MemoryHeapBase::READ_ONLY);
		@@ -261,6 +261,7 @@ AudioFlinger::~AudioFlinger()
		}

		// Tell media.log service about any old writers that still need to be unregistered
		if (mLogMemoryDealer != 0) {
		sp<IBinder> binder = defaultServiceManager()->getService(String16("media.log"));
		if (binder != 0) {
		sp<IMediaLogService> mediaLogService(interface_cast<IMediaLogService>(binder));
		@@ -270,7 +271,7 @@ AudioFlinger::~AudioFlinger()
		mediaLogService->unregisterWriter(iMemory);
		}
		}

		}
		}

		static const char * const audio_interfaces[] = {