Revert "Merge remote-tracking branch 'aosp/upstream-main'"
Revert submission 3308804 Reason for revert: b/373667975 Reverted changes: /q/submissionid:3308804 Change-Id: Ieb4e87d2bdcd975f5aa231c8e05f1053963c6c6e
This commit is contained in:
parent
3068d2b441
commit
8a3215bf53
12 changed files with 183 additions and 148 deletions
|
|
@ -1,4 +1,3 @@
|
|||
set noparent
|
||||
natsu@google.com
|
||||
ryanneph@google.com
|
||||
zzyiwei@chromium.org
|
||||
|
|
|
|||
|
|
@ -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) == gralloc_mask) {
|
||||
if ((*gralloc_usage) & gralloc_mask) {
|
||||
(*gralloc_usage) &= ~gralloc_mask;
|
||||
(*bo_use_flags) |= bo_mask;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue