summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-prod (mdb)2018-04-27 13:27:53 -0500
committerGerrit Code Review2018-04-27 13:27:53 -0500
commit2e38b2c0f640b29620d1e6a74b83dc4978c827f6 (patch)
tree0f74d4caf8180bf32b6e02eca64a0771743c845f
parent71d7d91ba8ad9d71ec77f64d69f79c84c7e4e2a6 (diff)
parent9f20633e6c38573388a873d9a963ba714b376c54 (diff)
downloadplatform-hardware-interfaces-2e38b2c0f640b29620d1e6a74b83dc4978c827f6.tar.gz
platform-hardware-interfaces-2e38b2c0f640b29620d1e6a74b83dc4978c827f6.tar.xz
platform-hardware-interfaces-2e38b2c0f640b29620d1e6a74b83dc4978c827f6.zip
Merge "HWC2On1Adapter: Fix fd leak in Layer::dump"
-rw-r--r--graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp b/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp
index 77f06bbb..d0167d9e 100644
--- a/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp
+++ b/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp
@@ -2094,8 +2094,7 @@ std::string HWC2On1Adapter::Layer::dump() const {
2094 } else if (mCompositionType == HWC2::Composition::Sideband) { 2094 } else if (mCompositionType == HWC2::Composition::Sideband) {
2095 output << " Handle: " << mSidebandStream << '\n'; 2095 output << " Handle: " << mSidebandStream << '\n';
2096 } else { 2096 } else {
2097 output << " Buffer: " << mBuffer.getBuffer() << "/" << 2097 output << " Buffer: " << mBuffer.getBuffer() << '\n';
2098 mBuffer.getFence() << '\n';
2099 output << fill << " Display frame [LTRB]: " << 2098 output << fill << " Display frame [LTRB]: " <<
2100 rectString(mDisplayFrame) << '\n'; 2099 rectString(mDisplayFrame) << '\n';
2101 output << fill << " Source crop: " << 2100 output << fill << " Source crop: " <<