commit c00c606060bc3d12096f21620bf3921dda3ff442
author Robin Lee <rgl@google.com> Thu Feb 03 10:44:37 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 03 10:44:37 2022 +0000
tree b6a4f2f9a3c1fba3408fff8ade7c19677f638257
parent ac1c828ec147d2a9f5cb9cb49c5d0a274d5e90bf
parent 38b59415d336b4f0de1441deb87a39a8e3e390cc

Merge "Gralloc4: accept invalid 0x2400 usage bits"

libs/ui/Gralloc4.cpp

diff --git a/libs/ui/Gralloc4.cpp b/libs/ui/Gralloc4.cpp
index c97cc94..1a42642 100644
--- a/libs/ui/Gralloc4.cpp
+++ b/libs/ui/Gralloc4.cpp
@@ -62,6 +62,9 @@
 static constexpr Error kTransactionError = Error::NO_RESOURCES;
 static const auto kAidlAllocatorServiceName = AidlIAllocator::descriptor + std::string("/default");
 
+// TODO(b/72323293, b/72703005): Remove these invalid bits from callers
+static constexpr uint64_t kRemovedUsageBits = static_cast<uint64_t>((1 << 10) | (1 << 13));
+
 uint64_t getValidUsageBits() {
     static const uint64_t validUsageBits = []() -> uint64_t {
         uint64_t bits = 0;
@@ -71,7 +74,7 @@
         }
         return bits;
     }();
-    return validUsageBits;
+    return validUsageBits | kRemovedUsageBits;
 }
 
 uint64_t getValidUsageBits41() {