commit 08170a325316b549208b08bafe46922c65831d08
author Yiwei Zhang <zzyiwei@google.com> Wed Aug 22 17:53:23 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 17:53:23 2018 +0000
tree f45df370486c662804e5b709c292463e52b1cf13
parent 071d25dd3bdcce6a93d25aa927ca0c78016755d0
parent ec90e583550fb96b31c7294cb6d73c482b84169d

Merge "Get screencap working correctly in landscape mode"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0181664..bb5b534 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4858,8 +4858,8 @@
         sourceCrop.set(dispScissor);
         // adb shell screencap will default reqWidth and reqHeight to zeros.
         if (reqWidth == 0 || reqHeight == 0) {
-            reqWidth = uint32_t(dispScissor.width());
-            reqHeight = uint32_t(dispScissor.height());
+            reqWidth = uint32_t(display->getViewport().width());
+            reqHeight = uint32_t(display->getViewport().height());
         }
     }