summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-03-10 03:16:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-10 03:16:56 +0000
commit2ad8099c9424c5b224e534c2f8f94c9c890ee2cd (patch)
treed76a9d4eca4f5ea512ea48232b34c49801588af8
parenta47db87c0f3982a04d1bafdeb15803ce82a70600 (diff)
parent69c79fcdda50dc66215580f8b10036e700a1c4e8 (diff)
downloadgs101-2ad8099c9424c5b224e534c2f8f94c9c890ee2cd.tar.gz
Merge "libhwc2.1: Moved log message in setColorModeWithRenderIntent to conditional" into tm-dev am: 69c79fcdda
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/17126429 Change-Id: I640da6faac7d896a16b86970a69187f9d2bfc0a2
-rw-r--r--libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index e9d1972..1dd2fc5 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -214,7 +214,6 @@ int32_t ExynosPrimaryDisplayModule::getRenderIntents(int32_t mode,
int32_t ExynosPrimaryDisplayModule::setColorModeWithRenderIntent(int32_t mode,
int32_t intent)
{
- ALOGD("%s: mode(%d), intent(%d)", __func__, mode, intent);
IDisplayColorGS101* displayColorInterface = getDisplayColorInterface();
const DisplayType display = getDisplayTypeFromIndex(mIndex);
const ColorModesMap colorModeMap = displayColorInterface == nullptr
@@ -242,8 +241,10 @@ int32_t ExynosPrimaryDisplayModule::setColorModeWithRenderIntent(int32_t mode,
mDisplaySceneInfo.setColorMode(colorMode);
mDisplaySceneInfo.setRenderIntent(renderIntent);
- if (mColorMode != mode)
+ if (mColorMode != mode) {
+ ALOGD("%s: mode(%d), intent(%d)", __func__, mode, intent);
setGeometryChanged(GEOMETRY_DISPLAY_COLOR_MODE_CHANGED);
+ }
mColorMode = (android_color_mode_t)mode;
return HWC2_ERROR_NONE;