diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-02-21 22:29:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-21 22:29:28 +0000 |
| commit | e53278451466870e61bb24f1b162f663dee73055 (patch) | |
| tree | f449bf915df207306a296d8c5dd2b392daca38b9 | |
| parent | 9585b7096baf0a2c7dc294ee7d0cab4fd6dc8e35 (diff) | |
| parent | f438e83f0b42a1c2d4e2be81bcf4c4e789514867 (diff) | |
| download | hwcomposer-e53278451466870e61bb24f1b162f663dee73055.tar.gz | |
Merge "Revert "Fix plane assignment issue for HWC2On1Adaptor.""
| -rwxr-xr-x | moorefield_hdmi/common/base/HwcLayerList.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/moorefield_hdmi/common/base/HwcLayerList.cpp b/moorefield_hdmi/common/base/HwcLayerList.cpp index 479534c..c163c8a 100755 --- a/moorefield_hdmi/common/base/HwcLayerList.cpp +++ b/moorefield_hdmi/common/base/HwcLayerList.cpp @@ -267,10 +267,6 @@ bool HwcLayerList::initialize() DEINIT_AND_RETURN_FALSE("layer %d is null", i); } - if ((layer->compositionType != HWC_FRAMEBUFFER_TARGET) && - (layer->compositionType != HWC_SIDEBAND)) - layer->compositionType = HWC_FRAMEBUFFER; - HwcLayer *hwcLayer = new HwcLayer(i, layer); if (!hwcLayer) { DEINIT_AND_RETURN_FALSE("failed to allocate hwc layer %d", i); @@ -909,7 +905,7 @@ DisplayPlane* HwcLayerList::getPlane(uint32_t index) const return 0; } - if (hwcLayer->getLayer()->handle == 0) { + if (hwcLayer->getHandle() == 0) { DLOGTRACE("plane is attached with invalid handle"); return 0; } |