summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-25 01:20:58 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-25 01:20:58 +0000
commite8bb46679e9517943ca3537d27e6868d82456bd9 (patch)
tree6c9e5d7c733231ed0133d5a41ac955f4b76d19eb
parent5c0465df10aaf6820013958762813e1ce4d94b20 (diff)
parent6f7c830755a1c053677e725adaed7476833656ca (diff)
downloadgs101-e8bb46679e9517943ca3537d27e6868d82456bd9.tar.gz
Snap for 10998418 from 6f7c830755a1c053677e725adaed7476833656ca to 24Q1-release
Change-Id: Ibc22ca7f4070a2a48914d78c5e67bc37bd534438
-rw-r--r--libhwc2.1/libdevice/ExynosDeviceModule.cpp5
-rw-r--r--libhwc2.1/libdevice/HistogramController.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/libhwc2.1/libdevice/ExynosDeviceModule.cpp b/libhwc2.1/libdevice/ExynosDeviceModule.cpp
index be259aa..2af614b 100644
--- a/libhwc2.1/libdevice/ExynosDeviceModule.cpp
+++ b/libhwc2.1/libdevice/ExynosDeviceModule.cpp
@@ -29,10 +29,9 @@ ExynosDeviceModule::ExynosDeviceModule() : ExynosDevice(), mDisplayColorLoader(D
std::vector<displaycolor::DisplayInfo> display_info;
for (uint32_t i = 0; i < mDisplays.size(); i++) {
ExynosDisplay* display = mDisplays[i];
- ExynosDisplayDrmInterfaceModule* moduleDisplayInterface =
- (ExynosDisplayDrmInterfaceModule*)(display->mDisplayInterface.get());
-
if (display->mType == HWC_DISPLAY_PRIMARY) {
+ ExynosDisplayDrmInterfaceModule* moduleDisplayInterface =
+ (ExynosDisplayDrmInterfaceModule*)(display->mDisplayInterface.get());
moduleDisplayInterface->getDisplayInfo(display_info);
}
}
diff --git a/libhwc2.1/libdevice/HistogramController.h b/libhwc2.1/libdevice/HistogramController.h
index 988e6e3..48a8948 100644
--- a/libhwc2.1/libdevice/HistogramController.h
+++ b/libhwc2.1/libdevice/HistogramController.h
@@ -14,10 +14,12 @@
* limitations under the License.
*/
+#pragma once
+
#include "HistogramDevice.h"
class HistogramController : public HistogramDevice {
public:
- HistogramController(ExynosDisplay *display) : HistogramDevice(display, 1, {}) {}
+ HistogramController(ExynosDisplay* display) : HistogramDevice(display, 1, {}) {}
virtual void initSupportSamplePosList() override;
};