Merge Android 14 QPR2 to AOSP mainHEADmastermain

Bug: 319669529
Merged-In: I96891913dcbb5200788ed5c4dfeb14d49a38087d
Change-Id: I2811a32c84358f709c4ceb35ad844064d6bb191c

4 files changed, 27 insertions, 2 deletions

diff --git a/histogram/histogram.h b/histogram/histogram.h
index a7b41ce..abb36d8 100644
--- a/histogram/histogram.h
+++ b/histogram/histogram.h
@@ -28,7 +28,7 @@ class IDLHistogram : public HistogramInfo {
  public:
   IDLHistogram() : HistogramInfo(HistogramType::HISTOGRAM_HIDL) {}
   virtual ~IDLHistogram() {}
-  virtual void setHistogramPos(HistogramPos pos) {
+  virtual void setHistogramPos(const HistogramPos& pos) {
       std::unique_lock<std::mutex> lk(mSetHistInfoMutex);
       mHistogramPos = pos;
   }
diff --git a/libhwc2.1/Android.mk b/libhwc2.1/Android.mk
index 20c85f0..9edcc70 100644
--- a/libhwc2.1/Android.mk
+++ b/libhwc2.1/Android.mk
@@ -15,6 +15,7 @@
 LOCAL_SRC_FILES += \
 	../../gs101/libhwc2.1/libcolormanager/DisplayColorModule.cpp \
 	../../gs101/libhwc2.1/libdevice/ExynosDeviceModule.cpp \
+	../../gs201/libhwc2.1/libdevice/HistogramController.cpp \
 	../../gs101/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp \
 	../../gs101/libhwc2.1/libresource/ExynosMPPModule.cpp \
 	../../gs201/libhwc2.1/libresource/ExynosMPPModule.cpp \
diff --git a/libhwc2.1/libdevice/HistogramController.cpp b/libhwc2.1/libdevice/HistogramController.cpp
new file mode 100644
index 0000000..f064b11
--- /dev/null
+++ b/libhwc2.1/libdevice/HistogramController.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "HistogramController.h"
+
+void HistogramController::initPlatformHistogramCapability() {
+    mHistogramCapability.supportSamplePosList.push_back(HistogramSamplePos::PRE_POSTPROC);
+}
diff --git a/libhwc2.1/libdevice/HistogramController.h b/libhwc2.1/libdevice/HistogramController.h
index e907943..fedeaa4 100644
--- a/libhwc2.1/libdevice/HistogramController.h
+++ b/libhwc2.1/libdevice/HistogramController.h
@@ -14,9 +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 initPlatformHistogramCapability() override;
 };