commit 46909e7eb074ce1b95b8a411eb71154f53f84f77
author Glenn Kasten <gkasten@google.com> Tue Feb 26 09:20:22 2013 -0800
committer Glenn Kasten <gkasten@google.com> Tue Feb 26 11:36:38 2013 -0800
tree a0b31a2590a604b0e2c7a6a133bba067dadfad5e
parent ceb388d6c03c38b96dc41c0ea4804b749aa077c4

Remove tee sink debugging at compile time

Bug: 8223560
Change-Id: Iddbfb06c45d43d9f20bb428215dd4094931e19a7

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index e0ab8cd..e81267f 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -90,6 +90,7 @@
 
 uint32_t AudioFlinger::mScreenState;
 
+#ifdef TEE_SINK
 bool AudioFlinger::mTeeSinkInputEnabled = false;
 bool AudioFlinger::mTeeSinkOutputEnabled = false;
 bool AudioFlinger::mTeeSinkTrackEnabled = false;
@@ -97,6 +98,7 @@
 size_t AudioFlinger::mTeeSinkInputFrames = kTeeSinkInputFramesDefault;
 size_t AudioFlinger::mTeeSinkOutputFrames = kTeeSinkOutputFramesDefault;
 size_t AudioFlinger::mTeeSinkTrackFrames = kTeeSinkTrackFramesDefault;
+#endif
 
 // ----------------------------------------------------------------------------
 
@@ -146,6 +148,7 @@
     if (doLog) {
         mLogMemoryDealer = new MemoryDealer(kLogMemorySize, "LogWriters");
     }
+#ifdef TEE_SINK
     (void) property_get("ro.debuggable", value, "0");
     int debuggable = atoi(value);
     int teeEnabled = 0;
@@ -159,6 +162,7 @@
         mTeeSinkOutputEnabled = true;
     if (teeEnabled & 4)
         mTeeSinkTrackEnabled = true;
+#endif
 }
 
 void AudioFlinger::onFirstRef()
@@ -347,10 +351,12 @@
             dev->dump(dev, fd);
         }
 
+#ifdef TEE_SINK
         // dump the serially shared record tee sink
         if (mRecordTeeSource != 0) {
             dumpTee(fd, mRecordTeeSource);
         }
+#endif
 
         if (locked) {
             mLock.unlock();
@@ -1624,6 +1630,7 @@
 
     if (status == NO_ERROR && inStream != NULL) {
 
+#ifdef TEE_SINK
         // Try to re-use most recently used Pipe to archive a copy of input for dumpsys,
         // or (re-)create if current Pipe is idle and does not match the new format
         sp<NBAIO_Sink> teeSink;
@@ -1670,6 +1677,7 @@
         default:
             break;
         }
+#endif
 
         AudioStreamIn *input = new AudioStreamIn(inHwDev, inStream);
 
@@ -1682,8 +1690,11 @@
                                   reqChannels,
                                   id,
                                   primaryOutputDevice_l(),
-                                  *pDevices,
-                                  teeSink);
+                                  *pDevices
+#ifdef TEE_SINK
+                                  , teeSink
+#endif
+                                  );
         mRecordThreads.add(id, thread);
         ALOGV("openInput() created record thread: ID %d thread %p", id, thread);
         if (pSamplingRate != NULL) *pSamplingRate = reqSamplingRate;
@@ -2235,6 +2246,7 @@
     return strcmp(((const Entry *) p1)->mName, ((const Entry *) p2)->mName);
 }
 
+#ifdef TEE_SINK
 void AudioFlinger::dumpTee(int fd, const sp<NBAIO_Source>& source, audio_io_handle_t id)
 {
     NBAIO_Source *teeSource = source.get();
@@ -2350,6 +2362,7 @@
         }
     }
 }
+#endif
 
 // ----------------------------------------------------------------------------