summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2016-09-28 21:02:00 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-28 21:02:00 +0000
commit1b080b15aabe46961bf8e05ed66e836c93896d24 (patch)
tree97ffd43ed0767a69451082dea60c33928184c5f9
parent5c9421500eb6e94be85e2365e868b6a3dce1de93 (diff)
parent73d4186757d6176d30282330619063c050a38a6b (diff)
Merge "Fix order of operations warning in libui"
am: 73d4186757 Change-Id: Ib93a8ddcb912b05cd38db1dea7ac0ff21a788bcd
-rw-r--r--include/ui/Gralloc1On0Adapter.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ui/Gralloc1On0Adapter.h b/include/ui/Gralloc1On0Adapter.h
index 33c2f870c6..d523c4f7e7 100644
--- a/include/ui/Gralloc1On0Adapter.h
+++ b/include/ui/Gralloc1On0Adapter.h
@@ -416,10 +416,10 @@ private:
if (!outData) {
const auto producerCpuUsage = GRALLOC1_PRODUCER_USAGE_CPU_READ |
GRALLOC1_PRODUCER_USAGE_CPU_WRITE;
- if (producerUsage & producerCpuUsage != 0) {
+ if ((producerUsage & producerCpuUsage) != 0) {
return static_cast<int32_t>(GRALLOC1_ERROR_BAD_VALUE);
}
- if (consumerUsage & GRALLOC1_CONSUMER_USAGE_CPU_READ != 0) {
+ if ((consumerUsage & GRALLOC1_CONSUMER_USAGE_CPU_READ) != 0) {
return static_cast<int32_t>(GRALLOC1_ERROR_BAD_VALUE);
}
}