Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 544c3912 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix order of operations warning in libui" am: 73d41867 

am: 1b080b15

Change-Id: I959d837f06cfbc747261b92d7202b953ee2e15f1
parents ef2e1afd 1b080b15

include/ui/Gralloc1On0Adapter.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -416,10 +416,10 @@ private: 
        if (!outData) {

        if (!outData) {

            const auto producerCpuUsage = GRALLOC1_PRODUCER_USAGE_CPU_READ |

            const auto producerCpuUsage = GRALLOC1_PRODUCER_USAGE_CPU_READ |

                    GRALLOC1_PRODUCER_USAGE_CPU_WRITE;

                    GRALLOC1_PRODUCER_USAGE_CPU_WRITE;

            if (producerUsage & producerCpuUsage != 0) {

            if ((producerUsage & producerCpuUsage) != 0) {

                return static_cast<int32_t>(GRALLOC1_ERROR_BAD_VALUE);

                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);

                return static_cast<int32_t>(GRALLOC1_ERROR_BAD_VALUE);

            }

            }

        }

        }