summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-12-01 18:51:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-01 18:51:13 -0800
commit2b9d7b1d6041c43c72e5970c0a186949c9a7a700 (patch)
treec6fa7c36a103cd5dd0df65230c808017942304b2 /libs
parent871465fdd57472c8114cd7b2a7c59c966b617dbe (diff)
parenta628e0238519a596e2d10981aae0aab65418f271 (diff)
downloadframeworks_base-2b9d7b1d6041c43c72e5970c0a186949c9a7a700.zip
frameworks_base-2b9d7b1d6041c43c72e5970c0a186949c9a7a700.tar.gz
frameworks_base-2b9d7b1d6041c43c72e5970c0a186949c9a7a700.tar.bz2
am a628e023: am 102f4dbb: am 8e4a110b: Merge change I5469a4ac into eclair
Merge commit 'a628e0238519a596e2d10981aae0aab65418f271' * commit 'a628e0238519a596e2d10981aae0aab65418f271': fixed [2260070] display stopped updating
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaceflinger/Layer.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp
index f5a5a0b..f11bf18 100644
--- a/libs/surfaceflinger/Layer.cpp
+++ b/libs/surfaceflinger/Layer.cpp
@@ -515,6 +515,11 @@ void Layer::unlockPageFlip(
dirtyRegion.andSelf(visibleRegionScreen);
outDirtyRegion.orSelf(dirtyRegion);
}
+ if (visibleRegionScreen.isEmpty()) {
+ // an invisible layer should not hold a freeze-lock
+ // (because it may never be updated and thereore never release it)
+ mFreezeLock.clear();
+ }
}
void Layer::finishPageFlip()