summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-07 21:09:49 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-07 21:09:49 -0400
commit4ff6d01d42fce2dc52b2dec8f59b625b18770bb0 (patch)
tree33c9e5c9c66fd8c2c749eb85a269eaa2ff9da998 /libs
parentc71413032e1ad1f166861a980d8547d4106f7fa0 (diff)
parent46b2df153fccf7f918ee5d7d747c208bdd2d55f4 (diff)
downloadframeworks_base-4ff6d01d42fce2dc52b2dec8f59b625b18770bb0.zip
frameworks_base-4ff6d01d42fce2dc52b2dec8f59b625b18770bb0.tar.gz
frameworks_base-4ff6d01d42fce2dc52b2dec8f59b625b18770bb0.tar.bz2
Merge change I46b2df15 into eclair
* changes: fix [2164183] sometimes device just wants to stay asleep
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaceflinger/Layer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp
index 2a3e667..7fd5434 100644
--- a/libs/surfaceflinger/Layer.cpp
+++ b/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()) {