Revert^2 "Merge remote-tracking branch 'aosp/upstream-main'"

8a3215bf53

Change-Id: I299a95b80910f102a652cbd577838ddfc65fdbc6
This commit is contained in:
Jason Macnak 2024-10-16 19:19:47 +00:00 committed by Gerrit Code Review
parent 8a3215bf53
commit 8956e04c7f
12 changed files with 149 additions and 184 deletions

View file

@ -1,3 +1,4 @@
set noparent
natsu@google.com
ryanneph@google.com
zzyiwei@chromium.org

View file

@ -96,7 +96,7 @@ uint32_t cros_gralloc_convert_format(int format)
static inline void handle_usage(uint64_t *gralloc_usage, uint64_t gralloc_mask,
uint64_t *bo_use_flags, uint64_t bo_mask)
{
if ((*gralloc_usage) & gralloc_mask) {
if (((*gralloc_usage) & gralloc_mask) == gralloc_mask) {
(*gralloc_usage) &= ~gralloc_mask;
(*bo_use_flags) |= bo_mask;
}