commit c9d972065c44860306add0172b5185bd8611f9ee
author Dan Stoza <stoza@google.com> Thu Mar 03 08:20:27 2016 -0800
committer Dan Stoza <stoza@google.com> Thu Mar 03 08:20:27 2016 -0800
tree 9e099bfc30df660396533a2baafb5685c717c457
parent 2e282a144aba0d6195256be85dece4efaf3de803
parent 7dbaaf19eb3c2abde55a7082a2bfcea059dc8b72

resolve merge conflicts of 7dbaaf19eb to nyc-dev-plus-aosp

Change-Id: I7c85803051511d932ddf5cd7f97dda9ea3145520

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 04256e1..4e7e9be 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -154,9 +154,7 @@
     mSurfaceFlingerConsumer->setContentsChangedListener(this);
     mSurfaceFlingerConsumer->setName(mName);
 
-#ifdef TARGET_DISABLE_TRIPLE_BUFFERING
-#warning "disabling triple buffering"
-#else
+#ifndef TARGET_DISABLE_TRIPLE_BUFFERING
     mProducer->setMaxDequeuedBufferCount(2);
 #endif