commit e06ad77bdd446ed2768b16a56179f97a0e3da043
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 22 19:52:48 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 19:52:48 2018 +0000
tree cbbe452562cca6e806709cacff8fa228443c8b84
parent 5ca4b905fe6fec08fdb560c5eb775f86a247f7ce
parent 9ad73bc2967d6d97d359cbad16996fcd7b83d30f

Merge "Get screencap working correctly in landscape mode" into pi-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a403f04..58dfc82 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4848,8 +4848,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(device->getViewport().width());
+            reqHeight = uint32_t(device->getViewport().height());
         }
     }