summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-09-27 12:32:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-27 12:32:17 -0700
commitd7b3c6471773191c2f60dd38bf106cebe45a94e5 (patch)
tree20d35bae2914e636a28d4a6af6285cb5063dca2e /services/surfaceflinger
parent2b2adbdda04c96592026e84243cbb0f90a2021c9 (diff)
parentda42e0faaa95c796dc49f3b38023562dab6584a7 (diff)
downloadframeworks_base-d7b3c6471773191c2f60dd38bf106cebe45a94e5.zip
frameworks_base-d7b3c6471773191c2f60dd38bf106cebe45a94e5.tar.gz
frameworks_base-d7b3c6471773191c2f60dd38bf106cebe45a94e5.tar.bz2
am da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
* commit 'da42e0faaa95c796dc49f3b38023562dab6584a7': SurfaceFlinger: fix setting default buffer size
Diffstat (limited to 'services/surfaceflinger')
-rw-r--r--services/surfaceflinger/Layer.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 49d2c55..1361fd6 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -371,11 +371,12 @@ uint32_t Layer::doTransaction(uint32_t flags)
Layer::State& editDraw(mDrawingState);
editDraw.requested_w = temp.requested_w;
editDraw.requested_h = temp.requested_h;
-
- // record the new size, form this point on, when the client request
- // a buffer, it'll get the new size.
- mSurfaceTexture->setDefaultBufferSize(temp.requested_w, temp.requested_h);
}
+
+ // record the new size, form this point on, when the client request
+ // a buffer, it'll get the new size.
+ mSurfaceTexture->setDefaultBufferSize(temp.requested_w,
+ temp.requested_h);
}
if (temp.sequence != front.sequence) {