ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Erik Gilling 2010-08-13 10:13:39 -07:00 committed by Android Git Automerger
parent 2642e5b29f ae95765868
commit 38af31e3e2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -839,7 +839,9 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty)
hwc.getNumLayers(), count);
// just to be extra-safe, use the smallest count
count = count < hwc.getNumLayers() ? count : hwc.getNumLayers();
if (hwc.initCheck() == NO_ERROR) {
count = count < hwc.getNumLayers() ? count : hwc.getNumLayers();
}
/*
* update the per-frame h/w composer data for each layer