am 4824d40a: sometimes SF would not process a surface resize
* commit '4824d40a35333182c2eb3593511b9bcbecd0a943':
sometimes SF would not process a surface resize
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 5e17d07..593f178 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -428,8 +428,8 @@
const Layer::State& front(drawingState());
const Layer::State& temp(currentState());
- const bool sizeChanged = (temp.requested.w != front.active.w) ||
- (temp.requested.h != front.active.h);
+ const bool sizeChanged = (temp.requested.w != front.requested.w) ||
+ (temp.requested.h != front.requested.h);
if (sizeChanged) {
// the size changed, we need to ask our client to request a new buffer
@@ -516,7 +516,6 @@
mPostedDirtyRegion.clear();
return;
}
- mRefreshPending = true;
// Capture the old state of the layer for comparisons later
const bool oldOpacity = isOpaque();
@@ -601,6 +600,7 @@
if (!isFixedSize) {
if (front.active.w != bufWidth ||
front.active.h != bufHeight) {
+ // reject this buffer
return true;
}
}
@@ -624,6 +624,7 @@
return;
}
+ mRefreshPending = true;
mFrameLatencyNeeded = true;
if (oldActiveBuffer == NULL) {
// the first time we receive a buffer, we need to trigger a