summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-09-27 12:28:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-27 12:28:59 -0700
commitda42e0faaa95c796dc49f3b38023562dab6584a7 (patch)
tree9e69712a6ec81c58f5b2f6f222241e59781eca1f /services/surfaceflinger
parent5fd141c245051f2fa84bf2559a417577391e40df (diff)
parent3a2321211179ae7889f6e1828a5d2af0041406b8 (diff)
downloadframeworks_base-da42e0faaa95c796dc49f3b38023562dab6584a7.zip
frameworks_base-da42e0faaa95c796dc49f3b38023562dab6584a7.tar.gz
frameworks_base-da42e0faaa95c796dc49f3b38023562dab6584a7.tar.bz2
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
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) {