am 4ff6d01d: Merge change I46b2df15 into eclair

Merge commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0' into eclair-mr2

* commit '4ff6d01d42fce2dc52b2dec8f59b625b18770bb0':
  fix [2164183] sometimes device just wants to stay asleep

libs/surfaceflinger/Layer.cpp

@@ -454,10 +454,10 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
 
             // recompute visible region
             recomputeVisibleRegions = true;
-
-            // we now have the correct size, unfreeze the screen
-            mFreezeLock.clear();
         }
+
+        // we now have the correct size, unfreeze the screen
+        mFreezeLock.clear();
     }
 
     if (lcblk->getQueuedCount()) {