diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-13 22:36:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-13 22:36:05 -0700 |
| commit | a31deaf4a960058e533da35d6229f7aa8d4f00c1 (patch) | |
| tree | 9ff5e002617f5121453cc71af963893a9a610cbd /libs/surfaceflinger/Layer.cpp | |
| parent | 185a5133cf4c805d3996a7f8fc3912a072f60f18 (diff) | |
| parent | c4915de8bb9454b8f10b0c9b7ac21e2bb7f65202 (diff) | |
| download | frameworks_base-a31deaf4a960058e533da35d6229f7aa8d4f00c1.zip frameworks_base-a31deaf4a960058e533da35d6229f7aa8d4f00c1.tar.gz frameworks_base-a31deaf4a960058e533da35d6229f7aa8d4f00c1.tar.bz2 | |
Merge change 21225 into eclair
* changes:
fix a bug that could cause a window to be hidden in some cases.
Diffstat (limited to 'libs/surfaceflinger/Layer.cpp')
| -rw-r--r-- | libs/surfaceflinger/Layer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/surfaceflinger/Layer.cpp b/libs/surfaceflinger/Layer.cpp index ac4bf7b..6f92515 100644 --- a/libs/surfaceflinger/Layer.cpp +++ b/libs/surfaceflinger/Layer.cpp @@ -596,7 +596,12 @@ Region Layer::post(uint32_t* previousSate, bool& recomputeVisibleRegions) Point Layer::getPhysicalSize() const { sp<const Buffer> front(frontBuffer().getBuffer()); - return Point(front->getWidth(), front->getHeight()); + Point size(front->getWidth(), front->getHeight()); + if ((size.x | size.y) == 0) { + // if we don't have a buffer yet, just use the state's size. + size = LayerBase::getPhysicalSize(); + } + return size; } void Layer::unlockPageFlip( |