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

Commit 38af31e3 authored by Erik Gilling's avatar Erik Gilling Committed by Android Git Automerger
Browse files

am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists 

Merge commit '94364b91a2894bf037b8beb027132fbb812e1434' into gingerbread-plus-aosp

* commit '94364b91a2894bf037b8beb027132fbb812e1434':
  surfaceflinger: don't check HWComposer numLayers unless one exists
parents 2642e5b2 ae957658

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -839,7 +839,9 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty) 
            hwc.getNumLayers(), count);



    // just to be extra-safe, use the smallest count

    if (hwc.initCheck() == NO_ERROR) {

        count = count < hwc.getNumLayers() ? count : hwc.getNumLayers();

    }



    /*

     *  update the per-frame h/w composer data for each layer