commit 9d58118da55718b3112f42aa8530b43ae6a9ba66
author Fabrice Di Meglio <fdimeglio@google.com> Wed May 18 12:50:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 12:50:34 2011 -0700
tree cbd620814078e72be1d911c01f36231f6b09c6a9
parent a28d034e540576eac9f86d904f1e87ba5fdb3df8
parent 18c7868cecfe3b1c18113d13bda4e853d43e9fb1

Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor"

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index b2f95cd..2cabe02 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -663,8 +663,9 @@
 
         // update the layer size and release freeze-lock
         const Layer::State& front(drawingState());
-        if (newFrontBuffer->getWidth()  == front.requested_w &&
-            newFrontBuffer->getHeight() == front.requested_h)
+        if ((newFrontBuffer->getWidth()  == front.requested_w &&
+            newFrontBuffer->getHeight() == front.requested_h) ||
+            isFixedSize())
         {
             if ((front.w != front.requested_w) ||
                 (front.h != front.requested_h))