Snap for 7968112 from 97abc71ca5f3ac3f7bfa996aa559e0a6ae7f6733 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-release

Change-Id: I370320dc24bfda1fa99d03e558a285d123452758

2 files changed, 9 insertions, 0 deletions

diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index 4946899..117dd25 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -1097,3 +1097,9 @@ bool ExynosPrimaryDisplayModule::isDisplaySwitched(int32_t mode, int32_t prevMod
     return (device->getActiveDisplay() != mIndex) && (prevMode == HWC_POWER_MODE_OFF) &&
             (mode != HWC_POWER_MODE_OFF);
 }
+
+bool ExynosPrimaryDisplayModule::isColorCalibratedByDevice() {
+    const DisplayType display = getDisplayTypeFromIndex(mIndex);
+    IDisplayColorGS101* displayColorInterface = getDisplayColorInterface();
+    return displayColorInterface->GetCalibrationInfo(display).factory_cal_loaded;
+};
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
index 679b20b..0339526 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -119,6 +119,9 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay {
             IDisplayColorGS101* displayColorInterface = getDisplayColorInterface();
             return displayColorInterface->IsRrCompensationEnabled(display);
         }
+
+        virtual bool isColorCalibratedByDevice();
+
         virtual int32_t getColorAdjustedDbv(uint32_t &dbv_adj);
 
         virtual void initLbe();