diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-02 00:23:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-02 00:23:11 +0000 |
commit | 31ee85c8481da99b13cab124dc83425e6948611e (patch) | |
tree | ff84bb76a2ae6308e501535f73387eb43220fb14 | |
parent | e603d9f115e78a1b3c7cd7ac3fb71ca345cd0e81 (diff) | |
parent | be2485dd622ba3f2f8d1fd2c3e8f401262c70241 (diff) | |
download | gs101-android13-gsi.tar.gz |
Snap for 8671863 from e8ad90586d15ed1380f41d6706d02a1b8ed34f05 to tm-release am: be2485dd62android13-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/18704246
Change-Id: I4878127b8ce9c853d9cd824cb5a555c8a2192fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 18 | ||||
-rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index a8425c4..a6ec3c1 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -1058,6 +1058,24 @@ LbeState ExynosPrimaryDisplayModule::getLbeState() { return mCurrentLbeState; } +PanelCalibrationStatus ExynosPrimaryDisplayModule::getPanelCalibrationStatus() { + auto displayColorInterface = getDisplayColorInterface(); + if (displayColorInterface == nullptr) { + return PanelCalibrationStatus::UNCALIBRATED; + } + + auto displayType = getBuiltInDisplayType(); + auto calibrationInfo = displayColorInterface->GetCalibrationInfo(displayType); + + if (calibrationInfo.factory_cal_loaded) { + return PanelCalibrationStatus::ORIGINAL; + } else if (calibrationInfo.golden_cal_loaded) { + return PanelCalibrationStatus::GOLDEN; + } else { + return PanelCalibrationStatus::UNCALIBRATED; + } +} + int32_t ExynosPrimaryDisplayModule::setAtcStDimming(uint32_t value) { Mutex::Autolock lock(mAtcStMutex); int32_t strength = mAtcStrength.value.get(); diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h index 8489f28..ada69f6 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h @@ -134,6 +134,8 @@ class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay { virtual void setLbeAmbientLight(int value); virtual LbeState getLbeState(); + virtual PanelCalibrationStatus getPanelCalibrationStatus(); + class DisplaySceneInfo { public: struct LayerMappingInfo { |