From 94364b91a2894bf037b8beb027132fbb812e1434 Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Thu, 12 Aug 2010 23:21:40 -0700 Subject: [PATCH] surfaceflinger: don't check HWComposer numLayers unless one exists Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c --- services/surfaceflinger/SurfaceFlinger.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 006bb1076ff2b..d257897266685 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -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