commit 168dfe71bfafebaa26b6f75df553f5fad7607669
author Andrew Hsieh <andrewhsieh@google.com> Tue Nov 06 20:43:06 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 20:43:06 2012 -0800
tree 6003150f794d9c48985d408a8b669e49105630c1
parent c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e
parent 5e530e02bc3073a2e2469df3c333ae14f1b37433

am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"

* commit '5e530e02bc3073a2e2469df3c333ae14f1b37433':
  Fix return type of glGetAttribLocation and glGetUniformLocation

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7ee6e5e..ce10c78 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -978,10 +978,10 @@
         if (hw->canDraw()) {
             // transform the dirty region into this screen's coordinate space
             const Region dirtyRegion(hw->getDirtyRegion(repaintEverything));
-            if (!dirtyRegion.isEmpty()) {
-                // repaint the framebuffer (if needed)
-                doDisplayComposition(hw, dirtyRegion);
-            }
+
+            // repaint the framebuffer (if needed)
+            doDisplayComposition(hw, dirtyRegion);
+
             hw->dirtyRegion.clear();
             hw->flip(hw->swapRegion);
             hw->swapRegion.clear();