diff options
| author | Stephen Hines <srhines@google.com> | 2017-01-13 17:16:21 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2017-01-13 17:21:45 -0800 |
| commit | b5a6873157670ce950384636a776ff070faac33b (patch) | |
| tree | 2473c909f45a7fa8458e39f4aaed9819f8331680 | |
| parent | bacd48231700ed2481e303d90ed62d96a2112991 (diff) | |
| download | hwcomposer-b5a6873157670ce950384636a776ff070faac33b.tar.gz | |
Fix incorrect use of the ! operator.android-o-preview-1android-n-mr2-preview-2o-preview
Bug: http://b/31532493
Operator precedence means that the unary ! will apply to
hwcLayer->getUsage() before applying the unary & operator with
GRALLOC_USAGE_HW_COMPOSER. This means that these checks will always fail
(because it is defined as 0x00000800U). This code has either never
executed, or just chose a fallback path to continue working.
Test: Built without errors/warnings using new compiler.
Change-Id: Ie5d67369edd801d3944be2dba9b3cc4ec289949a
| -rwxr-xr-x | moorefield_hdmi/common/base/HwcLayerList.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/moorefield_hdmi/common/base/HwcLayerList.cpp b/moorefield_hdmi/common/base/HwcLayerList.cpp index 5185e98..c163c8a 100755 --- a/moorefield_hdmi/common/base/HwcLayerList.cpp +++ b/moorefield_hdmi/common/base/HwcLayerList.cpp @@ -68,7 +68,7 @@ bool HwcLayerList::checkSupported(int planeType, HwcLayer *hwcLayer) } // check usage - if (!hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER) { + if (!(hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER)) { WLOGTRACE("not a composer layer"); return false; } @@ -134,7 +134,7 @@ bool HwcLayerList::checkRgbOverlaySupported(HwcLayer *hwcLayer) } // check usage - if (!hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER) { + if (!(hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER)) { WLOGTRACE("not a composer layer"); return false; } @@ -204,7 +204,7 @@ bool HwcLayerList::checkCursorSupported(HwcLayer *hwcLayer) } // check usage - if (!hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER) { + if (!(hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER)) { WLOGTRACE("not a composer layer"); return false; } |