summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-08-22 19:52:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-22 19:52:48 +0000
commite06ad77bdd446ed2768b16a56179f97a0e3da043 (patch)
treecbbe452562cca6e806709cacff8fa228443c8b84
parent5ca4b905fe6fec08fdb560c5eb775f86a247f7ce (diff)
parent9ad73bc2967d6d97d359cbad16996fcd7b83d30f (diff)
downloadnative-e06ad77bdd446ed2768b16a56179f97a0e3da043.tar.gz
Merge "Get screencap working correctly in landscape mode" into pi-dev
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a403f04030..58dfc82066 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4848,8 +4848,8 @@ status_t SurfaceFlinger::captureScreen(const sp<IBinder>& display, sp<GraphicBuf
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());
}
}