Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 890969b4 authored by Zhiquan Liu's avatar Zhiquan Liu Committed by android-build-merger
Browse files

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

am: c9d97206

* commit 'c9d97206':
  "#warning" conflict with -Werror
parents 7f60e002 c9d97206

services/surfaceflinger/Layer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -154,9 +154,7 @@ void Layer::onFirstRef() { 
    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