commit c7fbebe87ed5bd9ef1dcc1b3085b70dbfe9c88f9
author Mathias Agopian <mathias@google.com> Wed Aug 21 16:01:35 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 21 16:01:35 2013 -0700
tree 27235b41e866e857ffe57c47d1e044dd91da9b81
parent a8113c12ccb8a47f4756f33aa286ffbb5cfab6fd
parent 0a289c9cc8733a893ea145ddbbcc322dc92ea1c8

am 0a289c9c: am 4ceff3d5: screenshot layers wouldn\'t work in some cases

* commit '0a289c9cc8733a893ea145ddbbcc322dc92ea1c8':
  screenshot layers wouldn't work in some cases

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index d88f6d0..f867e86 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -991,6 +991,8 @@
                     if (front.active.w != bufWidth ||
                         front.active.h != bufHeight) {
                         // reject this buffer
+                        //ALOGD("rejecting buffer: bufWidth=%d, bufHeight=%d, front.active.{w=%d, h=%d}",
+                        //        bufWidth, bufHeight, front.active.w, front.active.h);
                         return true;
                     }
                 }

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3058af7..a151142 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2769,6 +2769,7 @@
 
         int err = 0;
         err = native_window_set_buffers_dimensions(window, reqWidth, reqHeight);
+        err |= native_window_set_scaling_mode(window, NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);
         err |= native_window_set_buffers_format(window, HAL_PIXEL_FORMAT_RGBA_8888);
         err |= native_window_set_usage(window, usage);