diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-24 02:05:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-24 02:05:22 +0000 |
| commit | 9b9f3565beb5d63eb46a82417d1beb34e25988c7 (patch) | |
| tree | 8b67368e0e20d3b380172a675c6825cd1dd33beb | |
| parent | f4fc89eba0b9d418b59c08c4b3bed50e5a9fd450 (diff) | |
| parent | 22bbe75bd5518b50075662ce4de40bc4867c43b0 (diff) | |
Merge "sf: Add check for unknown dataspace" into u-keystone-qcom-dev
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 0dcac494e3..b894396cee 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -16,7 +16,7 @@ /* Changes from Qualcomm Innovation Center are provided under the following license: * - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. * SPDX-License-Identifier: BSD-3-Clause-Clear */ @@ -3511,8 +3511,16 @@ void Layer::gatherBufferInfo() { { ATRACE_NAME("getDataspace"); err = mapper.getDataspace(mBufferInfo.mBuffer->getBuffer()->handle, &dataspace); + /* QTI_BEGIN */ + if (dataspace == ui::Dataspace::UNKNOWN) { + ALOGW("%s: Received unknown dataspace from gralloc", __func__); + } + /* QTI_END */ } - if (err != OK || dataspace != mBufferInfo.mDataspace) { + if ((err != OK || dataspace != mBufferInfo.mDataspace) + /* QTI_BEGIN */ + && dataspace != ui::Dataspace::UNKNOWN) { + /* QTI_END */ { ATRACE_NAME("setDataspace"); err = mapper.setDataspace(mBufferInfo.mBuffer->getBuffer()->handle, |