summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-04-21 10:54:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-21 10:54:23 +0000
commit56dd385ff70f2f0df68b627eb79f9fb2eaf41e25 (patch)
treeec6a555b5457165452f5e75e2c5fe62878e9b7c7
parent87e7507116916e15b984d75b4d5746902dc1de2f (diff)
parentdce496ae458a90a0e89b962910925319df7891d3 (diff)
downloadgs101-56dd385ff70f2f0df68b627eb79f9fb2eaf41e25.tar.gz
Merge "libhwc2.1: check null displaycolor interface" into tm-dev am: 693046fd4b am: dce496ae45
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/17048063 Change-Id: Icddf01f08df1271fcc6637451c1ee8bbce60dacb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
index 0b1aa41..8489f28 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -120,7 +120,9 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
virtual bool checkRrCompensationEnabled() {
const DisplayType display = getDisplayTypeFromIndex(mIndex);
IDisplayColorGS101* displayColorInterface = getDisplayColorInterface();
- return displayColorInterface->IsRrCompensationEnabled(display);
+ return displayColorInterface
+ ? displayColorInterface->IsRrCompensationEnabled(display)
+ : false;
}
virtual bool isColorCalibratedByDevice();