commit 94364b91a2894bf037b8beb027132fbb812e1434
author Erik Gilling <konkers@android.com> Thu Aug 12 23:21:40 2010 -0700
committer Mathias Agopian <mathias@google.com> Fri Aug 13 10:10:48 2010 -0700
tree 921da7245e7faab6feb77527d658b1e896867e4b
parent c8d0d6307fc5cdd24083113456ac33790a5fb94a

surfaceflinger: don't check HWComposer numLayers unless one exists

Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 006bb10..d257897 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -839,7 +839,9 @@
             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