From 6e09703ad66b72253fc47551bd8bfe6a0946ea76 Mon Sep 17 00:00:00 2001
From: Yadong Qi <yadong.qi@intel.com>
Date: Sun, 26 Sep 2021 13:39:36 +0800
Subject: [PATCH 01/23] cfc: auto mount share folders

auto mount share folders for Pictures and Download

Tracked-On: OAM-97753
Signed-off-by: Yadong Qi <yadong.qi@intel.com>
---
 groups/device-specific/caas_cfc/BoardConfig.mk |  3 +++
 groups/device-specific/caas_cfc/files.spec     |  1 +
 groups/device-specific/caas_cfc/init.rc        | 17 +++++++++++++++++
 groups/device-specific/caas_cfc/mount_share.sh |  8 ++++++++
 groups/device-specific/caas_cfc/product.mk     |  1 +
 5 files changed, 30 insertions(+)
 create mode 100755 groups/device-specific/caas_cfc/mount_share.sh

diff --git a/groups/device-specific/caas_cfc/BoardConfig.mk b/groups/device-specific/caas_cfc/BoardConfig.mk
index e932e53c2..0c4565283 100644
--- a/groups/device-specific/caas_cfc/BoardConfig.mk
+++ b/groups/device-specific/caas_cfc/BoardConfig.mk
@@ -41,6 +41,9 @@ PRODUCT_PRIVATE_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/clipboard_agent/private
 #add vendor property
 BOARD_SEPOLICY_DIRS += device/intel/sepolicy/vendor/
 
+#add share folder property
+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/virt-share/
+
 TARGET_USES_HWC2 := true
 BOARD_USES_GENERIC_AUDIO := false
 
diff --git a/groups/device-specific/caas_cfc/files.spec b/groups/device-specific/caas_cfc/files.spec
index 80d9378b3..91f2afb55 100644
--- a/groups/device-specific/caas_cfc/files.spec
+++ b/groups/device-specific/caas_cfc/files.spec
@@ -27,3 +27,4 @@ wakeup.py: "guest wakeup from vinput-manager"
 rpmb_dev: "rpmb simulation application"
 cfc_example.sh: "host cfc example"
 input-port-associations.xml: "Input routing Configuration file"
+mount_share.sh: "script for auto mount share folder on boot"
diff --git a/groups/device-specific/caas_cfc/init.rc b/groups/device-specific/caas_cfc/init.rc
index 9c5febdaf..66d245e50 100644
--- a/groups/device-specific/caas_cfc/init.rc
+++ b/groups/device-specific/caas_cfc/init.rc
@@ -56,3 +56,20 @@ on post-fs
 #For OMX
 on post-fs-data
     setprop debug.stagefright.ccodec 0
+
+on boot
+    start mount_share
+
+service mount_share /vendor/bin/mount_share.sh
+    user system
+    group system
+    disabled
+    oneshot
+
+on property:vendor.intel.mount_share=1
+    mount 9p Download9p /data/media/0/Download mode=0777
+    mount none /data/media/0/Download /mnt/user/0/emulated/0/Download bind
+    mkdir /storage/emulated/0/Download/WeChat 0777
+    mount 9p Pictures9p /data/media/0/Pictures mode=0777
+    mount none /data/media/0/Pictures /mnt/user/0/emulated/0/Pictures bind
+    mkdir /storage/emulated/0/Pictures/WeChat 0777
diff --git a/groups/device-specific/caas_cfc/mount_share.sh b/groups/device-specific/caas_cfc/mount_share.sh
new file mode 100755
index 000000000..fffead4bc
--- /dev/null
+++ b/groups/device-specific/caas_cfc/mount_share.sh
@@ -0,0 +1,8 @@
+#!/vendor/bin/sh
+
+until mount |grep "/mnt/user/0/emulated/0/Android/obb"
+do
+	sleep 1s
+done
+
+setprop vendor.intel.mount_share 1
diff --git a/groups/device-specific/caas_cfc/product.mk b/groups/device-specific/caas_cfc/product.mk
index a6429e707..be111e219 100755
--- a/groups/device-specific/caas_cfc/product.mk
+++ b/groups/device-specific/caas_cfc/product.mk
@@ -70,3 +70,4 @@ PRODUCT_COPY_FILES += vendor/intel/fw/trusty-release-binaries/rpmb_dev:$(PRODUCT
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/wakeup.py:$(PRODUCT_OUT)/scripts/wakeup.py
 PRODUCT_COPY_FILES += $(LOCAL_PATH)/cfc_example.sh:$(PRODUCT_OUT)/scripts/cfc_example.sh
 PRODUCT_COPY_FILES += device/intel/civ/host/virtual-input-manager/input-port-associations.xml:vendor/etc/input-port-associations.xml
+PRODUCT_COPY_FILES += $(LOCAL_PATH)/mount_share.sh:$(TARGET_COPY_OUT_VENDOR)/bin/mount_share.sh

From d877bf97a102d4e7181613e79a0491695c19c9c2 Mon Sep 17 00:00:00 2001
From: renchenglei <chenglei.ren@intel.com>
Date: Wed, 8 Sep 2021 17:58:03 +0800
Subject: [PATCH 02/23] Adjust CFC resolution

This is to help change resolution of CFC
to 600*960

Tracked-On: OAM-98784
Signed-off-by: Ren Chenglei <chenglei.ren@intel.com>
---
 groups/aaf/cfc/init.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groups/aaf/cfc/init.rc b/groups/aaf/cfc/init.rc
index dbbffb4e2..187602c2e 100644
--- a/groups/aaf/cfc/init.rc
+++ b/groups/aaf/cfc/init.rc
@@ -3,7 +3,7 @@ on fs
     mount 9p aaf /mnt/share
     exec - system system -- /vendor/bin/logwrapper /vendor/bin/sh /vendor/bin/auto_detection.sh
     setprop ro.hardware.hwcomposer remote
-    setprop sys.display.size 540x960
+    setprop sys.display.size 600x960
     setprop ro.hardware.gralloc ${vendor.gralloc.set}
     setprop ro.power.fixed_performance_scale_factor ${vendor.power.fixed_performance_scale_factor}
     setprop ro.media.xml_variant.codecs ${ro.vendor.media.target_variant}

From 32e343fa0c965d0a790726fec5c18ce0e8d84640 Mon Sep 17 00:00:00 2001
From: Yadong Qi <yadong.qi@intel.com>
Date: Sat, 9 Oct 2021 09:22:59 +0800
Subject: [PATCH 03/23] create WeiXin folder with 0777 for sharing

create WeiXin folder with 0777 for sharing

Tracked-On: OAM-99638
Signed-off-by: Yadong Qi <yadong.qi@intel.com>
---
 groups/device-specific/caas_cfc/init.rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/groups/device-specific/caas_cfc/init.rc b/groups/device-specific/caas_cfc/init.rc
index 66d245e50..d7fcd14cd 100644
--- a/groups/device-specific/caas_cfc/init.rc
+++ b/groups/device-specific/caas_cfc/init.rc
@@ -70,6 +70,8 @@ on property:vendor.intel.mount_share=1
     mount 9p Download9p /data/media/0/Download mode=0777
     mount none /data/media/0/Download /mnt/user/0/emulated/0/Download bind
     mkdir /storage/emulated/0/Download/WeChat 0777
+    mkdir /storage/emulated/0/Download/WeiXin 0777
     mount 9p Pictures9p /data/media/0/Pictures mode=0777
     mount none /data/media/0/Pictures /mnt/user/0/emulated/0/Pictures bind
     mkdir /storage/emulated/0/Pictures/WeChat 0777
+    mkdir /storage/emulated/0/Pictures/WeiXin 0777

From 52402f3f9feb24ff5ab7fc7cc4941c0d9f15eda7 Mon Sep 17 00:00:00 2001
From: gkdeepa <g.k.deepa@intel.com>
Date: Tue, 24 Aug 2021 08:04:00 +0530
Subject: [PATCH 04/23] Include VHAL for camera

legacy hal inclusion
properties declaration
product package inclusion for libs

Tracked-On:OAM-99722
Signed-off-by: gkdeepa g.k.deepa@intel.com
---
 groups/camera-ext/ext-camera-only/product.mk | 17 +++++++++++++++--
 groups/device-specific/caas/manifest.xml     |  1 +
 groups/device-specific/caas_cfc/manifest.xml |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/groups/camera-ext/ext-camera-only/product.mk b/groups/camera-ext/ext-camera-only/product.mk
index 815464cfb..84cb4adc3 100644
--- a/groups/camera-ext/ext-camera-only/product.mk
+++ b/groups/camera-ext/ext-camera-only/product.mk
@@ -5,9 +5,22 @@ PRODUCT_COPY_FILES += \
 
 # External camera service
 PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \
+                    android.hardware.camera.provider@2.4-service_64 \
                     android.hardware.camera.provider@2.4-impl
+#VHAL camera
+PRODUCT_PACKAGES += camera.$(TARGET_BOARD_PLATFORM) \
+                    camera.$(TARGET_BOARD_PLATFORM).jpeg
 
+PRODUCT_PROPERTY_OVERRIDES += ro.vendor.remote.sf.fake_camera ="both" \
+                              ro.vendor.camera.in_frame_format.h264=false \
+                              ro.vendor.camera.in_frame_format.i420=true \
+                              ro.vendor.camera.decode.vaapi=false \
+                              ro.vendor.remote.sf.back_camera_hal= \
+                              ro.vendor.remote.sf.front_camera_hal= \
+                              ro.vendor.camera.transference="VSOCK" \
+                              vendor.camera.external="VHAL"
+#removing not required apps
 # Only include test apps in eng or userdebug builds.
-PRODUCT_PACKAGES_DEBUG += TestingCamera
+#PRODUCT_PACKAGES_DEBUG += TestingCamera
 
-PRODUCT_PACKAGES += MultiCameraApp
+#PRODUCT_PACKAGES += MultiCameraApp
diff --git a/groups/device-specific/caas/manifest.xml b/groups/device-specific/caas/manifest.xml
index 5d2842486..eed535af0 100644
--- a/groups/device-specific/caas/manifest.xml
+++ b/groups/device-specific/caas/manifest.xml
@@ -122,6 +122,7 @@
         <interface>
             <name>ICameraProvider</name>
             <instance>external/0</instance>
+            <instance>legacy/0</instance>
         </interface>
     </hal>
     <hal format="hidl">
diff --git a/groups/device-specific/caas_cfc/manifest.xml b/groups/device-specific/caas_cfc/manifest.xml
index 499945f59..5a41ab8cb 100644
--- a/groups/device-specific/caas_cfc/manifest.xml
+++ b/groups/device-specific/caas_cfc/manifest.xml
@@ -149,6 +149,7 @@
         <interface>
             <name>ICameraProvider</name>
             <instance>external/0</instance>
+            <instance>legacy/0</instance>
         </interface>
     </hal>
     <hal format="hidl">

From c41eced6d54cf6ee76ffa71a0c31f0efecb6fc64 Mon Sep 17 00:00:00 2001
From: "Li, HaihongX" <haihongx.li@intel.com>
Date: Mon, 30 Aug 2021 15:38:05 +0800
Subject: [PATCH 05/23] Switch from ia-hwc to drm-hwc

Tracked-On: OAM-99705
Signed-off-by: Li, HaihongX <haihongx.li@intel.com>
---
 groups/graphics/auto/auto_hal.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/groups/graphics/auto/auto_hal.in b/groups/graphics/auto/auto_hal.in
index 5aa3871ac..ffdb00b1e 100644
--- a/groups/graphics/auto/auto_hal.in
+++ b/groups/graphics/auto/auto_hal.in
@@ -2,19 +2,19 @@ update_graphics() {
 case "$(cat /proc/fb)" in
         *i915)
                 echo "intel"
-                setprop vendor.hwcomposer.set intel
+                setprop vendor.hwcomposer.set drm_minigbm
                 setprop vendor.gralloc.set intel
                 setprop vendor.hwcomposer.edid.all 0
                 ;;
         *i915drmfb)
                 echo "intel"
-                setprop vendor.hwcomposer.set intel
+                setprop vendor.hwcomposer.set drm_minigbm
                 setprop vendor.gralloc.set intel
                 setprop vendor.hwcomposer.edid.all 0
                 ;;
         *inteldrmfb)
                 echo "intel"
-                setprop vendor.hwcomposer.set intel
+                setprop vendor.hwcomposer.set drm_minigbm
                 setprop vendor.gralloc.set intel
                 setprop vendor.hwcomposer.edid.all 0
                 ;;

From c368d54b8c1e0fb1cdb89d685cdc037d4e9bf348 Mon Sep 17 00:00:00 2001
From: Salini Venate <salini.venate@intel.com>
Date: Tue, 26 Oct 2021 03:59:49 +0530
Subject: [PATCH 06/23] Add Mainline patch level

As per Partner Security Advisory, Google has identified
a potential issue where Android 11 devices receiving
Mainline updates could enter an unusable state. To adress that
patches:A-182960918 and A-193932765 should be applied and
mainline patch level flag should be updated.

Tracked-On: OAM-99831
Signed-off-by: Salini Venate <salini.venate@intel.com>
---
 groups/googleservice/gms/product.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/groups/googleservice/gms/product.mk b/groups/googleservice/gms/product.mk
index 7607c70f5..9a0428b7c 100644
--- a/groups/googleservice/gms/product.mk
+++ b/groups/googleservice/gms/product.mk
@@ -2,4 +2,5 @@ FLAG_GMS_AVAILABLE ?= true
 ifeq ($(FLAG_GMS_AVAILABLE),true)
 $(call inherit-product-if-exists, vendor/google/gms/products/gms.mk)
 $(call inherit-product, vendor/partner_modules/build/mainline_modules.mk)
+MAINLINE_PATCH_LEVEL_1 := true
 endif

From d09cb229dc6f0132a3fe6ad3fe21acc06d5d6195 Mon Sep 17 00:00:00 2001
From: "ji, zhenlong z" <zhenlong.z.ji@intel.com>
Date: Tue, 26 Oct 2021 13:53:22 +0800
Subject: [PATCH 07/23] Remove the configuration for the status bar

Set a fixed value for the status bar height introduced many
regressions, so remove the customized configuration.

Tracked-On: OAM-99819
Signed-off-by: ji, zhenlong z <zhenlong.z.ji@intel.com>
---
 .../overlay/frameworks/base/core/res/res/values/dimens.xml     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/groups/device-specific/caas_cfc/overlay/frameworks/base/core/res/res/values/dimens.xml b/groups/device-specific/caas_cfc/overlay/frameworks/base/core/res/res/values/dimens.xml
index 728118167..bbdfa6f53 100644
--- a/groups/device-specific/caas_cfc/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/groups/device-specific/caas_cfc/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -25,7 +25,4 @@
     <!-- Width of the navigation bar when it is placed vertically on the screen -->
     <dimen name="navigation_bar_width">0dp</dimen>
 
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">1dp</dimen>
-
 </resources>

From 7126d12d859e5f6b47b056565c8c910d4549261a Mon Sep 17 00:00:00 2001
From: Kishan Mochi <kishan.mochi@intel.com>
Date: Mon, 27 Sep 2021 11:51:44 +0530
Subject: [PATCH 08/23] change H265 encoder min res to 176x144

To pass CTS VideoEncoderTest for testOtherH265,
change H265 encoder min resolution to 176x144.

Tracked-On: OAM-99358
Signed-off-by: Kishan Mochi <kishan.mochi@intel.com>
---
 groups/codecs/configurable/media_codecs_gen12.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groups/codecs/configurable/media_codecs_gen12.xml b/groups/codecs/configurable/media_codecs_gen12.xml
index 50685d347..4b1e0aaf3 100644
--- a/groups/codecs/configurable/media_codecs_gen12.xml
+++ b/groups/codecs/configurable/media_codecs_gen12.xml
@@ -223,7 +223,7 @@ Only the three quirks included above are recognized at this point:
 {{/hw_ve_vp9}}
 {{#hw_ve_h265}}
         <MediaCodec name="OMX.Intel.hw_ve.h265" type="video/hevc" >
-            <Limit name="size" min="64x64" max="8192x8192" />
+            <Limit name="size" min="176x144" max="8192x8192" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" range="1-972000" />

From 37b29e850c2f8fa095fd04f68d1d0a633ea8a12b Mon Sep 17 00:00:00 2001
From: pmandri <padmashree.mandri@intel.com>
Date: Fri, 12 Nov 2021 10:54:27 +0530
Subject: [PATCH 09/23] Set capture volume to maximum

Set capture volume to maximum
Tracked-On: OAM-100032
Signed-off-by: pmandri <padmashree.mandri@intel.com>
Signed-off-by: gkdeepa <g.k.deepa@intel.com>
---
 groups/audio/project-celadon/default/mixer_paths_0.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groups/audio/project-celadon/default/mixer_paths_0.xml b/groups/audio/project-celadon/default/mixer_paths_0.xml
index 0be20d7fa..03981de96 100644
--- a/groups/audio/project-celadon/default/mixer_paths_0.xml
+++ b/groups/audio/project-celadon/default/mixer_paths_0.xml
@@ -18,7 +18,7 @@
 
   <path name="main-mic">
     <ctl name="Capture Switch" value="1 1" />
-    <ctl name="Capture Volume" value="63 63" />
+    <ctl name="Capture Volume" value="74 74" />
     <ctl name="Capture Source" value="Internal Mic" />
   </path>
 

From c719e42158977d40d9877d29d719a8f14b1f3291 Mon Sep 17 00:00:00 2001
From: rajucm <raju.mallikarjun.chegaraddi@intel.com>
Date: Wed, 24 Nov 2021 13:11:03 +0530
Subject: [PATCH 10/23] sensorhal-2.0: mixin changes..

sensor-2.0 - Adding support
sensor-1.0 - Remove support

Tracked-On: OAM-99160
Signed-off-by: rajucm <raju.mallikarjun.chegaraddi@intel.com>
---
 groups/device-specific/caas/framework_manifest.xml | 10 ----------
 groups/device-specific/caas/manifest.xml           |  9 ---------
 groups/sensors/mediation/product.mk                |  7 +------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/groups/device-specific/caas/framework_manifest.xml b/groups/device-specific/caas/framework_manifest.xml
index d2a05ebb2..24d8266b8 100644
--- a/groups/device-specific/caas/framework_manifest.xml
+++ b/groups/device-specific/caas/framework_manifest.xml
@@ -181,14 +181,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-
 </manifest>
diff --git a/groups/device-specific/caas/manifest.xml b/groups/device-specific/caas/manifest.xml
index eed535af0..ea5fb7020 100644
--- a/groups/device-specific/caas/manifest.xml
+++ b/groups/device-specific/caas/manifest.xml
@@ -143,15 +143,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <kernel target-level="5"/>
     <sepolicy>
         <version>30.0</version>
diff --git a/groups/sensors/mediation/product.mk b/groups/sensors/mediation/product.mk
index f2d72e9e2..80f799c15 100644
--- a/groups/sensors/mediation/product.mk
+++ b/groups/sensors/mediation/product.mk
@@ -2,13 +2,8 @@ ifeq ($(TARGET_BOARD_PLATFORM),)
     $(error Please define TARGET_BOARD_PLATFORM in product-level Makefile)
 endif
 
-# Sensors HAL modules
 PRODUCT_PACKAGES += \
-        sensors.$(TARGET_BOARD_PLATFORM)
-
-PRODUCT_PACKAGES += \
-        android.hardware.sensors@1.0-service \
-        android.hardware.sensors@1.0-impl
+        android.hardware.sensors@2.0-service.intel
 
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:vendor/etc/permissions/android.hardware.sensor.ambient_temperature.xml \

From ace9f670e56b385f410986acfbf4d58dcaea4b90 Mon Sep 17 00:00:00 2001
From: Salini Venate <salini.venate@intel.com>
Date: Wed, 24 Nov 2021 22:47:05 +0530
Subject: [PATCH 11/23] Enable block-level deduplication for product partition

Celadon build was failing at creation of super.img during
integration of latest gms package - gmsversion 11_202111.
Failure:
lpmake E [liblp]Partition product_a is part of group
group_sys_a which does not have enough space free
(1824354304 requested, 2373951488 used out of 4190109696)

So enabling block-level deduplication to resolve the issue as per
https://source.android.com/devices/tech/ota/dynamic_partitions/implement

Tracked-On: OAM-100067
Signed-off-by: Salini Venate <salini.venate@intel.com>
---
 groups/product-partition/true/BoardConfig.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/groups/product-partition/true/BoardConfig.mk b/groups/product-partition/true/BoardConfig.mk
index 05da1394c..d6599fefe 100644
--- a/groups/product-partition/true/BoardConfig.mk
+++ b/groups/product-partition/true/BoardConfig.mk
@@ -10,3 +10,4 @@ TARGET_USE_PRODUCT := true
 {{#slot-ab}}
 AB_OTA_PARTITIONS += product
 {{/slot-ab}}
+BOARD_EXT4_SHARE_DUP_BLOCKS := true

From 62def6eb88a70b75572ed32f192e015c1308b52c Mon Sep 17 00:00:00 2001
From: "Yang,JunchaoX" <junchaox.yang@intel.com>
Date: Fri, 19 Nov 2021 15:17:22 +0800
Subject: [PATCH 12/23] solve Video recording of 720p is blur

Tracked-On: OAM-99403
Signed-off-by: Yang,JunchaoX <junchaox.yang@intel.com>
---
 groups/codecs/configurable/media_profiles_1080p.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/groups/codecs/configurable/media_profiles_1080p.xml b/groups/codecs/configurable/media_profiles_1080p.xml
index f6363eab7..40be47f05 100644
--- a/groups/codecs/configurable/media_profiles_1080p.xml
+++ b/groups/codecs/configurable/media_profiles_1080p.xml
@@ -145,7 +145,7 @@
 
         <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
             <Video codec="h264"
-                   bitRate="256000"
+                   bitRate="3000000"
                    width="1280"
                    height="720"
                    frameRate="30" />

From 6b1d734718b970a6e6691fd7d2ab58d1c36184b1 Mon Sep 17 00:00:00 2001
From: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
Date: Wed, 1 Dec 2021 14:27:20 +0530
Subject: [PATCH 13/23] Removing hcitools from product.mk

hcitools are used only for debugging and hence removing
it from Android source tree

Tracked-On: OAM-100206
Signed-off-by: Aiswarya Cyriac <aiswarya.cyriac@intel.com>
---
 groups/bluetooth/btusb/product.mk | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/groups/bluetooth/btusb/product.mk b/groups/bluetooth/btusb/product.mk
index 69b51b23d..12da959c0 100644
--- a/groups/bluetooth/btusb/product.mk
+++ b/groups/bluetooth/btusb/product.mk
@@ -1,12 +1,3 @@
-PRODUCT_PACKAGES += \
-    hciconfig
-
-# Bluetooth tools eng / userdebug
-ifneq ($(TARGET_BUILD_VARIANT),user)
-PRODUCT_PACKAGES += \
-    btmon \
-    hcitool
-endif
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \

From d8677ad46c58bd5ffb6e0850fc4a94959260aa1e Mon Sep 17 00:00:00 2001
From: rajucm <raju.mallikarjun.chegaraddi@intel.com>
Date: Fri, 17 Dec 2021 10:06:45 +0530
Subject: [PATCH 14/23] sensorhal-2.0: adding sensor_list enable/disable
 feature

Tracked-On: OAM-100260
Signed-off-by: rajucm <raju.mallikarjun.chegaraddi@intel.com>
Signed-off-by: rajani <rajani.ranjan@intel.com>
---
 groups/sensors/mediation/BoardConfig.mk | 4 ++++
 groups/sensors/mediation/option.spec    | 2 ++
 groups/sensors/mediation/product.mk     | 2 ++
 3 files changed, 8 insertions(+)
 create mode 100644 groups/sensors/mediation/option.spec

diff --git a/groups/sensors/mediation/BoardConfig.mk b/groups/sensors/mediation/BoardConfig.mk
index 7f6aba9b4..0adc82826 100644
--- a/groups/sensors/mediation/BoardConfig.mk
+++ b/groups/sensors/mediation/BoardConfig.mk
@@ -1,3 +1,7 @@
 USE_SENSOR_MEDIATION_HAL := true
 
+SOONG_CONFIG_NAMESPACES += senPlugin
+SOONG_CONFIG_senPlugin  += SENSOR_LIST
+SOONG_CONFIG_senPlugin_SENSOR_LIST := {{enable_sensor_list}}
+
 BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/sensors/mediation
diff --git a/groups/sensors/mediation/option.spec b/groups/sensors/mediation/option.spec
new file mode 100644
index 000000000..ff58bddcd
--- /dev/null
+++ b/groups/sensors/mediation/option.spec
@@ -0,0 +1,2 @@
+[defaults]
+enable_sensor_list = true
diff --git a/groups/sensors/mediation/product.mk b/groups/sensors/mediation/product.mk
index 80f799c15..44e905d1c 100644
--- a/groups/sensors/mediation/product.mk
+++ b/groups/sensors/mediation/product.mk
@@ -5,6 +5,7 @@ endif
 PRODUCT_PACKAGES += \
         android.hardware.sensors@2.0-service.intel
 
+{{#enable_sensor_list}}
 PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:vendor/etc/permissions/android.hardware.sensor.ambient_temperature.xml \
         frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:vendor/etc/permissions/android.hardware.sensor.accelerometer.xml \
@@ -13,3 +14,4 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.sensor.light.xml:vendor/etc/permissions/android.hardware.sensor.light.xml
 
 AUTO_IN += $(TARGET_DEVICE_DIR)/{{_extra_dir}}/auto_hal.in
+{{/enable_sensor_list}}

From a5f37ccb3dbc411aa922edf3b53b3e9a24ea6e6a Mon Sep 17 00:00:00 2001
From: Jaikrishna Nemallapudi <nemallapudi.jaikrishna@intel.com>
Date: Tue, 9 Nov 2021 11:09:47 +0530
Subject: [PATCH 15/23] Disabel sensor service

Sensors are not required for CFC.

Tracked-On: OAM-100260
Signed-off-by: Jaikrishna Nemallapudi <nemallapudi.jaikrishna@intel.com>
---
 groups/device-specific/caas_cfc/compatibility_matrix.xml | 8 --------
 groups/device-specific/caas_cfc/framework_manifest.xml   | 9 ---------
 groups/device-specific/caas_cfc/manifest.xml             | 9 ---------
 3 files changed, 26 deletions(-)

diff --git a/groups/device-specific/caas_cfc/compatibility_matrix.xml b/groups/device-specific/caas_cfc/compatibility_matrix.xml
index 6fe200e2c..b6132c4c7 100644
--- a/groups/device-specific/caas_cfc/compatibility_matrix.xml
+++ b/groups/device-specific/caas_cfc/compatibility_matrix.xml
@@ -15,14 +15,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
-        <name>android.frameworks.sensorservice</name>
-        <version>1.0</version>
-        <interface>
-            <name>ISensorManager</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="false">
         <name>android.hidl.allocator</name>
         <version>1.0</version>
diff --git a/groups/device-specific/caas_cfc/framework_manifest.xml b/groups/device-specific/caas_cfc/framework_manifest.xml
index f04618a69..3d460418c 100644
--- a/groups/device-specific/caas_cfc/framework_manifest.xml
+++ b/groups/device-specific/caas_cfc/framework_manifest.xml
@@ -190,14 +190,5 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 
 </manifest>
diff --git a/groups/device-specific/caas_cfc/manifest.xml b/groups/device-specific/caas_cfc/manifest.xml
index 5a41ab8cb..dc4f049fb 100644
--- a/groups/device-specific/caas_cfc/manifest.xml
+++ b/groups/device-specific/caas_cfc/manifest.xml
@@ -170,15 +170,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <kernel target-level="5"/>
     <sepolicy>
         <version>30.0</version>

From 92c7d23e4e41a62ee99cda26387025655eb91ca2 Mon Sep 17 00:00:00 2001
From: Zhuo Peng <zhuo.peng@intel.com>
Date: Fri, 25 Jun 2021 11:29:02 +0800
Subject: [PATCH 16/23] Mixin support STMMAC and Marvell drivers for EHL CiV

Tracked-On: OAM-100298
Signed-off-by: Zhuo Peng <zhuo.peng@intel.com>
Change-Id: Id233583708701e97fee190dfd4668bff900314ca
---
 groups/ethernet/dhcp/init.rc                                | 5 +++++
 .../gmin64/config-lts/lts2019-chromium/x86_64_defconfig     | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/groups/ethernet/dhcp/init.rc b/groups/ethernet/dhcp/init.rc
index d6a98e8b2..58179b0aa 100644
--- a/groups/ethernet/dhcp/init.rc
+++ b/groups/ethernet/dhcp/init.rc
@@ -16,3 +16,8 @@ on post-fs
     insmod /vendor/lib/modules/pps_core.ko
     insmod /vendor/lib/modules/ptp.ko
     insmod /vendor/lib/modules/e1000e.ko
+    insmod /vendor/lib/modules/marvell.ko
+    insmod /vendor/lib/modules/phylink.ko
+    insmod /vendor/lib/modules/stmmac.ko
+    insmod /vendor/lib/modules/stmmac-pci.ko
+
diff --git a/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig b/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig
index fc4f9b107..adbb43b58 100644
--- a/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig
+++ b/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig
@@ -2161,7 +2161,7 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_SELFTESTS is not set
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
-# CONFIG_STMMAC_PCI is not set
+CONFIG_STMMAC_PCI=m
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_DWC_XLGMAC is not set
@@ -2211,8 +2211,8 @@ CONFIG_SWPHY=y
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MICROCHIP_PHY is not set
 # CONFIG_MICROCHIP_T1_PHY is not set

From 5d1ca5511867d6287e7d6afb65af5cb8a0996ca1 Mon Sep 17 00:00:00 2001
From: Swee Yee Fonn <swee.yee.fonn@intel.com>
Date: Wed, 23 Jun 2021 12:37:53 +0800
Subject: [PATCH 17/23] Mixins: kernel config builtin i915 firmware

Size limit is changed to 35MB for boot partition to include the
firmware.

Tracked-On: OAM-100298
Signed-off-by: Swee Yee Fonn <swee.yee.fonn@intel.com>
---
 groups/boot-arch/project-celadon/BoardConfig.mk                | 2 +-
 groups/boot-arch/project-celadon/gpt.ini                       | 2 +-
 .../kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/groups/boot-arch/project-celadon/BoardConfig.mk b/groups/boot-arch/project-celadon/BoardConfig.mk
index c99051ed8..6658f24c2 100644
--- a/groups/boot-arch/project-celadon/BoardConfig.mk
+++ b/groups/boot-arch/project-celadon/BoardConfig.mk
@@ -19,7 +19,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 #
 
 # NOTE: These values must be kept in sync with BOARD_GPT_INI
-BOARD_BOOTIMAGE_PARTITION_SIZE ?= 31457280
+BOARD_BOOTIMAGE_PARTITION_SIZE ?= 36700160
 SYSTEM_PARTITION_SIZE = $(shell echo {{system_partition_size}}*1024*1024 | bc)
 {{^dynamic-partitions}}
 BOARD_SYSTEMIMAGE_PARTITION_SIZE ?= $(SYSTEM_PARTITION_SIZE)
diff --git a/groups/boot-arch/project-celadon/gpt.ini b/groups/boot-arch/project-celadon/gpt.ini
index ed95c4f14..3f76a4c81 100644
--- a/groups/boot-arch/project-celadon/gpt.ini
+++ b/groups/boot-arch/project-celadon/gpt.ini
@@ -54,7 +54,7 @@ type = fat
 
 [partition.boot]
 label = boot
-len = 30
+len = 35
 type = boot
 {{#slot-ab}}
 has_slot = true
diff --git a/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig b/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig
index adbb43b58..d0970e0a4 100644
--- a/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig
+++ b/groups/kernel/gmin64/config-lts/lts2019-chromium/x86_64_defconfig
@@ -1557,7 +1557,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
+CONFIG_EXTRA_FIRMWARE="${EXTRA_FW}"
+CONFIG_EXTRA_FIRMWARE_DIR="${EXTRA_FW_DIR}"
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 # CONFIG_FW_LOADER_COMPRESS is not set

From ea008419b370f6da3c5064697319737a58cca100 Mon Sep 17 00:00:00 2001
From: "Ai, Ting" <ting.a.ai@intel.com>
Date: Wed, 29 Dec 2021 13:10:13 +0800
Subject: [PATCH 18/23] Add DnDAgent apk to caas_cfg

This is for drag and drop feature

Tracked-On: OAM-100024
Signed-off-by: Ai, Ting <ting.a.ai@intel.com>
---
 groups/device-specific/caas_cfc/product.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/groups/device-specific/caas_cfc/product.mk b/groups/device-specific/caas_cfc/product.mk
index be111e219..df9df4665 100755
--- a/groups/device-specific/caas_cfc/product.mk
+++ b/groups/device-specific/caas_cfc/product.mk
@@ -24,6 +24,8 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES += ClipboardAgent
 
+PRODUCT_PACKAGES += DnDAgent
+
 PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl \
                     android.hardware.keymaster@3.0-service \
                     android.hardware.usb@1.0-impl \

From 4afb829bb4a1701db8190df7caf51d4381bf7bcf Mon Sep 17 00:00:00 2001
From: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
Date: Thu, 16 Dec 2021 14:11:42 +0530
Subject: [PATCH 19/23] Set TARGET_BOARD_KERNEL_HEADERS based on kernel used
 for build

Instead of using kernel header from the respective kernel
header folder, default kernel header folder is used.

Fix the issue by setting TARGET_BOARD_KERNEL_HEADERS based
on kernel used for building CIV.

Tracked-On: OAM-100417
Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan@intel.com>
---
 groups/kernel/BoardConfig.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/groups/kernel/BoardConfig.mk b/groups/kernel/BoardConfig.mk
index e7ae50e01..a93d6ab65 100644
--- a/groups/kernel/BoardConfig.mk
+++ b/groups/kernel/BoardConfig.mk
@@ -1,5 +1,13 @@
 # Specify location of board-specific kernel headers
-TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/{{{src_path}}}/kernel-headers
+ifeq ($(BASE_CHROMIUM_KERNEL), true)
+  TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/{{{chromium_src_path}}}/kernel-headers
+else ifeq ($(BASE_LTS2020_YOCTO_KERNEL), true)
+  TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/{{{lts2020_yocto_src_path}}}/kernel-headers
+else ifeq ($(BASE_YOCTO_KERNEL), true)
+  TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/{{{yocto_src_path}}}/kernel-headers
+else
+  TARGET_BOARD_KERNEL_HEADERS := $(INTEL_PATH_COMMON)/{{{src_path}}}/kernel-headers
+endif
 
 ifneq ($(TARGET_BUILD_VARIANT),user)
 KERNEL_LOGLEVEL ?= {{{loglevel}}}

From c42be6b18e47cee8bb88b33d91e65d9e0210a17b Mon Sep 17 00:00:00 2001
From: Kishan Mochi <kishan.mochi@intel.com>
Date: Tue, 30 Nov 2021 21:47:40 +0530
Subject: [PATCH 20/23] Enable zram swap for device having <= 4G ram

zram swap to increase available memory when device is
under memory pressure.

Tracked-On: OAM-100254
Signed-off-by: Kishan Mochi <kishan.mochi@intel.com>
---
 groups/swap/zram_auto/check_lowmem.sh | 10 +++++-----
 groups/swap/zram_auto/init.rc         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/groups/swap/zram_auto/check_lowmem.sh b/groups/swap/zram_auto/check_lowmem.sh
index 5ae5b88a7..e938f8622 100755
--- a/groups/swap/zram_auto/check_lowmem.sh
+++ b/groups/swap/zram_auto/check_lowmem.sh
@@ -1,13 +1,13 @@
 #!/vendor/bin/sh
 
-# 2G size in kB
-SIZE_2G=2097152
+# 4G size in kB
+SIZE_4G=4194304
 
 mem_size=`cat /proc/meminfo | grep MemTotal | tr -s ' ' | cut -d ' ' -f 2`
 
-if [ "$mem_size" -le "$SIZE_2G" ]
+if [ "$mem_size" -le "$SIZE_4G" ]
 then
-    setprop vendor.low_ram 1
+    setprop vendor.le_4g_ram 1
 else
-    setprop vendor.low_ram 0
+    setprop vendor.le_4g_ram 0
 fi
diff --git a/groups/swap/zram_auto/init.rc b/groups/swap/zram_auto/init.rc
index 0ace57eb7..320383325 100644
--- a/groups/swap/zram_auto/init.rc
+++ b/groups/swap/zram_auto/init.rc
@@ -4,7 +4,7 @@ on boot
     write /proc/sys/vm/page-cluster 0
 {{#swappiness}}
    # Avoid evicting pages and use zram disk
-    write /proc/sys/vm/swappiness 100
+    write /proc/sys/vm/swappiness 10
 {{/swappiness}}
 {{#disk_based_swap}}
    # Enable disk_based_swap on Chromium kernels
@@ -14,6 +14,6 @@ on boot
 on post-fs
     exec - system system -- /vendor/bin/check_lowmem.sh
 
-on property:vendor.low_ram=1
+on property:vendor.le_4g_ram=1
     # Enable swaps described in the fstab
     swapon_all /vendor/etc/fstab.${ro.hardware}

From d345d7f0d41f8bc5da682719aecc4986aa2bcc9f Mon Sep 17 00:00:00 2001
From: yuxincui <yuxin.cui@intel.com>
Date: Wed, 12 Jan 2022 16:33:57 +0800
Subject: [PATCH 21/23] Enable keymaster 3.0

It will use different service binaries based on whether trusty
is enabled or disabled:
w/ trusty:
android.hardware.keymaster@3.0-service.trusty
w/o Trusty:
android.hardware.keymaster@3.0-service

Tracked-On: OAM-100659
Signed-off-by: yuxincui <yuxin.cui@intel.com>
---
 groups/trusty/false/product.mk |  3 ++-
 groups/trusty/true/option.spec |  1 -
 groups/trusty/true/product.mk  | 16 ++--------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/groups/trusty/false/product.mk b/groups/trusty/false/product.mk
index e11216547..d1b8cbc73 100644
--- a/groups/trusty/false/product.mk
+++ b/groups/trusty/false/product.mk
@@ -1,2 +1,3 @@
 PRODUCT_PACKAGES += \
-    android.hardware.gatekeeper@1.0-service.software
+    android.hardware.gatekeeper@1.0-service.software \
+    android.hardware.keymaster@3.0-service
diff --git a/groups/trusty/true/option.spec b/groups/trusty/true/option.spec
index f8b0f505b..b6cc701e0 100644
--- a/groups/trusty/true/option.spec
+++ b/groups/trusty/true/option.spec
@@ -2,5 +2,4 @@
 lk_project       = sand-x86-64
 enable_hw_sec    = true
 enable_storage_proxyd = true
-keymaster_version   = 2
 ref_target =
diff --git a/groups/trusty/true/product.mk b/groups/trusty/true/product.mk
index c2acdf2e0..18cdcfd80 100644
--- a/groups/trusty/true/product.mk
+++ b/groups/trusty/true/product.mk
@@ -1,25 +1,12 @@
 {{#enable_hw_sec}}
 
-KM_VERSION := {{{keymaster_version}}}
-
-ifeq ($(KM_VERSION),2)
-PRODUCT_PACKAGES += \
-	keystore.trusty
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.hardware.keystore=trusty
-endif
-
-ifeq ($(KM_VERSION),1)
-PRODUCT_PACKAGES += \
-	keystore.${TARGET_BOARD_PLATFORM}
-endif
-
 PRODUCT_PACKAGES += \
 	libtrusty \
 	storageproxyd \
 	libinteltrustystorage \
 	libinteltrustystorageinterface \
 	android.hardware.gatekeeper@1.0-service.trusty \
+	android.hardware.keymaster@3.0-service.trusty \
 	keybox_provisioning \
 
 PRODUCT_PACKAGES_DEBUG += \
@@ -30,4 +17,5 @@ PRODUCT_PACKAGES_DEBUG += \
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.hardware.gatekeeper=trusty \
+	ro.hardware.keystore=trusty
 {{/enable_hw_sec}}

From c741f1e77c76f7f51668d9f9cef47b4e7cb20e38 Mon Sep 17 00:00:00 2001
From: Kishan Mochi <kishan.mochi@intel.com>
Date: Sun, 11 Jul 2021 19:31:29 +0530
Subject: [PATCH 22/23] Add media codec files for EHL

media_codecs_gen11.xml and media_codecs_performance_ehl.xml
to support EHL

Change-Id: I0cf0fa05569da08f40727c0370fc21e7aec16eda
Tracked-On: OAM-100758
Signed-off-by: Kishan Mochi <kishan.mochi@intel.com>
---
 groups/codecs/configurable/auto_hal.in        |   3 +
 groups/codecs/configurable/files.spec         |   2 +
 .../configurable/media_codecs_gen11.xml       | 242 ++++++++++++++++++
 .../media_codecs_performance_ehl.xml          | 120 +++++++++
 groups/codecs/configurable/product.mk         |   2 +
 5 files changed, 369 insertions(+)
 create mode 100644 groups/codecs/configurable/media_codecs_gen11.xml
 create mode 100644 groups/codecs/configurable/media_codecs_performance_ehl.xml

diff --git a/groups/codecs/configurable/auto_hal.in b/groups/codecs/configurable/auto_hal.in
index eab9dfbf1..82ccfc3a6 100644
--- a/groups/codecs/configurable/auto_hal.in
+++ b/groups/codecs/configurable/auto_hal.in
@@ -6,6 +6,9 @@ value_model=`grep -i model /proc/cpuinfo | cut -d ':' -f2 | head -n 1`
 if [ $value_model == 166 ]; then
     setprop ro.vendor.media.target_variant "_gen9"
     setprop ro.vendor.media.target_variant_platform "_cml"
+elif [ $value_model == 150 ]; then
+    setprop ro.vendor.media.target_variant "_gen11"
+    setprop ro.vendor.media.target_variant_platform "_ehl"
 elif [ $value_model == 141 ]; then
     setprop ro.vendor.media.target_variant "_gen12"
     setprop ro.vendor.media.target_variant_platform "_tgl"
diff --git a/groups/codecs/configurable/files.spec b/groups/codecs/configurable/files.spec
index e462830ef..755d7cd83 100644
--- a/groups/codecs/configurable/files.spec
+++ b/groups/codecs/configurable/files.spec
@@ -1,10 +1,12 @@
 [extrafiles]
 media_codecs_gen9.xml: "Specific configuration for audio and video codecs for gen9"
+media_codecs_gen11.xml: "Specific configuration for audio and video codecs for gen11"
 media_codecs_gen12.xml: "Specific configuration for audio and video codecs for gen12"
 mfx_omxil_core.conf: "MSDK configuration for video codecs"
 media_profiles.xml: "Media profile file"
 media_profiles_1080p.xml: "Media profile file with 1080p support"
 media_codecs_performance_cml.xml: "Media codecs performance file for cml"
+media_codecs_performance_ehl.xml: "Media codecs performance file for ehl"
 media_codecs_performance_tgl.xml: "Media codecs performance file for tgl"
 media_codecs_performance_{{platform}}_xen.xml: "Media codecs performance file for xen"
 media_codecs_vp9.xml: "vp9 support"
diff --git a/groups/codecs/configurable/media_codecs_gen11.xml b/groups/codecs/configurable/media_codecs_gen11.xml
new file mode 100644
index 000000000..4b1e0aaf3
--- /dev/null
+++ b/groups/codecs/configurable/media_codecs_gen11.xml
@@ -0,0 +1,242 @@
+<!-- Copyright (C) 2012 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.
+-->
+
+<!--
+<!DOCTYPE MediaCodecs [
+<!ELEMENT MediaCodecs (Decoders,Encoders)>
+<!ELEMENT Decoders (MediaCodec*)>
+<!ELEMENT Encoders (MediaCodec*)>
+<!ELEMENT MediaCodec (Type*,Quirk*)>
+<!ATTLIST MediaCodec name CDATA #REQUIRED>
+<!ATTLIST MediaCodec type CDATA>
+<!ELEMENT Type EMPTY>
+<!ATTLIST Type name CDATA #REQUIRED>
+<!ELEMENT Quirk EMPTY>
+<!ATTLIST Quirk name CDATA #REQUIRED>
+]>
+
+There's a simple and a complex syntax to declare the availability of a
+media codec:
+
+A codec that properly follows the OpenMax spec and therefore doesn't have any
+quirks and that only supports a single content type can be declared like so:
+
+    <MediaCodec name="OMX.foo.bar" type="something/interesting" />
+
+If a codec has quirks OR supports multiple content types, the following syntax
+can be used:
+
+    <MediaCodec name="OMX.foo.bar" >
+        <Type name="something/interesting" />
+        <Type name="something/else" />
+        ...
+        <Quirk name="requires-allocate-on-input-ports" />
+        <Quirk name="requires-allocate-on-output-ports" />
+        <Quirk name="output-buffers-are-unreadable" />
+    </MediaCodec>
+
+Only the three quirks included above are recognized at this point:
+
+"requires-allocate-on-input-ports"
+    must be advertised if the component does not properly support specification
+    of input buffers using the OMX_UseBuffer(...) API but instead requires
+    OMX_AllocateBuffer to be used.
+
+"requires-allocate-on-output-ports"
+    must be advertised if the component does not properly support specification
+    of output buffers using the OMX_UseBuffer(...) API but instead requires
+    OMX_AllocateBuffer to be used.
+
+"output-buffers-are-unreadable"
+    must be advertised if the emitted output buffers of a decoder component
+    are not readable, i.e. use a custom format even though abusing one of
+    the official OMX colorspace constants.
+    Clients of such decoders will not be able to access the decoded data,
+    naturally making the component much less useful. The only use for
+    a component with this quirk is to render the output to the screen.
+    Audio decoders MUST NOT advertise this quirk.
+    Video decoders that advertise this quirk must be accompanied by a
+    corresponding color space converter for thumbnail extraction,
+    matching surfaceflinger support that can render the custom format to
+    a texture and possibly other code, so just DON'T USE THIS QUIRK.
+
+-->
+
+<MediaCodecs>
+    <Decoders>
+{{#hw_vd_vc1}}
+        <MediaCodec name="OMX.Intel.hw_vd.vc1" type="video/x-ms-wmv" >
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/hw_vd_vc1}}
+
+{{#sw_vd_h264}}
+        <MediaCodec name="OMX.Intel.sw_vd.h264" type="video/avc" >
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="1920x1080" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-1920x1080" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/sw_vd_h264}}
+
+{{#hw_vd_h264}}
+        <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" >
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/hw_vd_h264}}
+
+{{#hw_vd_h264_secure}}
+        <MediaCodec name="OMX.Intel.hw_vd.h264.secure" type="video/avc">
+            <!-- profiles and levels:  ProfileBaseline : Level51 -->
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+            <Feature name="secure-playback" required="true" />
+        </MediaCodec>
+{{/hw_vd_h264_secure}}
+
+{{#hw_vd_vp8}}
+        <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" >
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/hw_vd_vp8}}
+
+{{#hw_vd_vp9}}
+        <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" >
+            <Limit name="size" min="64x64" max="8192x8192" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/hw_vd_vp9}}
+
+{{#hw_vd_h265}}
+        <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" >
+            <Limit name="size" min="64x64" max="8192x8192" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/hw_vd_h265}}
+
+{{#hw_vd_h265_secure}}
+        <MediaCodec name="OMX.Intel.hw_vd.h265.secure" type="video/hevc" >
+           <Limit name="size" min="64x64" max="8192x8192" />
+           <Limit name="alignment" value="2x2" />
+           <Limit name="block-size" value="16x16" />
+           <Limit name="blocks-per-second" range="1-972000" />
+           <Limit name="bitrate" range="1-40000000" />
+           <Limit name="performance-point-3840x2160" value="30" />
+           <Feature name="adaptive-playback" />
+           <Feature name="secure-playback" required="true" />
+        </MediaCodec>
+{{/hw_vd_h265_secure}}
+
+{{#hw_vd_mp2}}
+        <MediaCodec name="OMX.Intel.hw_vd.mp2" type="video/mpeg2" >
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
+{{/hw_vd_mp2}}
+    </Decoders>
+
+    <Encoders>
+{{#hw_ve_h264}}
+        <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" >
+            <Limit name="size" min="176x144" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+        </MediaCodec>
+{{/hw_ve_h264}}
+{{#hw_ve_vp8}}
+        <MediaCodec name="OMX.Intel.hw_ve.vp8" type="video/x-vnd.on2.vp8" >
+            <Limit name="size" min="176x144" max="3840x2160" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+        </MediaCodec>
+{{/hw_ve_vp8}}
+{{#hw_ve_vp9}}
+        <MediaCodec name="OMX.Intel.hw_ve.vp9" type="video/x-vnd.on2.vp9" >
+            <Limit name="size" min="176x144" max="8192x8192" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+        </MediaCodec>
+{{/hw_ve_vp9}}
+{{#hw_ve_h265}}
+        <MediaCodec name="OMX.Intel.hw_ve.h265" type="video/hevc" >
+            <Limit name="size" min="176x144" max="8192x8192" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" range="1-972000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="performance-point-3840x2160" value="30" />
+        </MediaCodec>
+{{/hw_ve_h265}}
+    </Encoders>
+{{#sw_omx_video}}
+    <Include href="media_codecs_google_video.xml" />
+{{/sw_omx_video}}
+    <Include href="media_codecs_google_audio.xml" />
+    <Settings>
+        <Setting name="max-video-encoder-input-buffers" value="9" />
+    </Settings>
+</MediaCodecs>
diff --git a/groups/codecs/configurable/media_codecs_performance_ehl.xml b/groups/codecs/configurable/media_codecs_performance_ehl.xml
new file mode 100644
index 000000000..31a188ef8
--- /dev/null
+++ b/groups/codecs/configurable/media_codecs_performance_ehl.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2015 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.
+-->
+
+<MediaCodecs>
+    <Decoders>
+        <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="350-650" />
+            <Limit name="measured-frame-rate-352x288" range="250-500" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="134-203" />
+            <Limit name="measured-frame-rate-720x480" range="170-190" />
+            <Limit name="measured-frame-rate-1280x720" range="50-58" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-32" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-352x288" range="134-203" />
+            <Limit name="measured-frame-rate-640x360" range="98-152" />
+            <Limit name="measured-frame-rate-720x480" range="170-190" />
+            <Limit name="measured-frame-rate-1280x720" range="70-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="18-36" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="400-600" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="250-500" />
+            <Limit name="measured-frame-rate-640x360" range="290-320" />
+            <Limit name="measured-frame-rate-1280x720" range="65-70" />
+            <Limit name="measured-frame-rate-1920x1080" range="25-30" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="200-450" />
+            <Limit name="measured-frame-rate-640x360" range="220-330" />
+            <Limit name="measured-frame-rate-1280x720" range="80-170" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-100" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.h264" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="300-450" />
+	    <Limit name="measured-frame-rate-720x480" range="400-550" />
+            <Limit name="measured-frame-rate-1280x720" range="460-900" />
+            <Limit name="measured-frame-rate-1920x1088" range="320-390" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.h265" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-352x288" range="320-430" />
+            <Limit name="measured-frame-rate-640x360" range="380-450" />
+            <Limit name="measured-frame-rate-720x480" range="260-380" />
+            <Limit name="measured-frame-rate-1280x720" range="220-290" />
+            <Limit name="measured-frame-rate-1920x1080" range="190-220" />
+            <Limit name="measured-frame-rate-3840x2160" range="120-130" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.vp8" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="700-1450" />
+            <Limit name="measured-frame-rate-640x360" range="400-950" />
+            <Limit name="measured-frame-rate-1280x720" range="150-600" />
+            <Limit name="measured-frame-rate-1920x1080" range="100-330" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_vd.vp9" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="385-425" />
+            <Limit name="measured-frame-rate-640x360" range="500-1300" />
+            <Limit name="measured-frame-rate-1280x720" range="200-230" />
+            <Limit name="measured-frame-rate-1920x1080" range="350-420" />
+            <Limit name="measured-frame-rate-3840x2160" range="100-130" />
+        </MediaCodec>
+    </Decoders>
+    <Encoders>
+        <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="200-450" />
+            <Limit name="measured-frame-rate-720x480" range="50-150" />
+            <Limit name="measured-frame-rate-1280x720" range="30-55" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-40" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="25-55" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="260-600" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="400-600" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="150-300" />
+            <Limit name="measured-frame-rate-640x360" range="95-150" />
+            <Limit name="measured-frame-rate-1280x720" range="32-38" />
+            <Limit name="measured-frame-rate-1920x1080" range="22-25" />
+        </MediaCodec>
+        <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="96-106" />
+            <Limit name="measured-frame-rate-640x360" range="39-39" />
+            <Limit name="measured-frame-rate-1280x720" range="7-9" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_ve.h264" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="260-500" />
+            <Limit name="measured-frame-rate-720x480" range="140-160" />
+            <Limit name="measured-frame-rate-1280x720" range="75-110" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-55" />
+        </MediaCodec>
+        <MediaCodec name="OMX.Intel.hw_ve.h265" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="200-400" />
+            <Limit name="measured-frame-rate-720x480" range="120-160" />
+            <Limit name="measured-frame-rate-1280x720" range="70-90" />
+            <Limit name="measured-frame-rate-1920x1080" range="35-45" />
+            <Limit name="measured-frame-rate-3840x2160" range="10-14" />
+        </MediaCodec>
+    </Encoders>
+</MediaCodecs>
diff --git a/groups/codecs/configurable/product.mk b/groups/codecs/configurable/product.mk
index 439062853..d8fa253ca 100644
--- a/groups/codecs/configurable/product.mk
+++ b/groups/codecs/configurable/product.mk
@@ -16,6 +16,7 @@ else
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_{{gpu}}.xml:vendor/etc/media_codecs.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_gen9.xml:vendor/etc/media_codecs_gen9.xml \
+    $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_gen11.xml:vendor/etc/media_codecs_gen11.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_gen12.xml:vendor/etc/media_codecs_gen12.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/mfx_omxil_core.conf:vendor/etc/mfx_omxil_core.conf
 endif
@@ -24,6 +25,7 @@ endif
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_{{platform}}.xml:vendor/etc/media_codecs_performance.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_cml.xml:vendor/etc/media_codecs_performance_cml.xml \
+    $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_ehl.xml:vendor/etc/media_codecs_performance_ehl.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_tgl.xml:vendor/etc/media_codecs_performance_tgl.xml
 {{/codec_perf_xen}}
 {{#codec_perf_xen}}

From aeceb2c3810fe5898018aa04756cec1932080fb7 Mon Sep 17 00:00:00 2001
From: Swee Yee Fonn <swee.yee.fonn@intel.com>
Date: Mon, 20 Dec 2021 12:49:59 +0800
Subject: [PATCH 23/23] Add QMP client which syncs guest RTC settings to host

Add new QMP host utility guest_rtc_monitor
into build.

Tracked-On: OAM-100921
Signed-off-by: Swee Yee Fonn <swee.yee.fonn@intel.com>
---
 groups/device-specific/caas/AndroidBoard.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/groups/device-specific/caas/AndroidBoard.mk b/groups/device-specific/caas/AndroidBoard.mk
index 052fad500..edc29a242 100644
--- a/groups/device-specific/caas/AndroidBoard.mk
+++ b/groups/device-specific/caas/AndroidBoard.mk
@@ -26,5 +26,10 @@ em-host-utilities:
 	cd device/intel/civ/host/backend/thermal/vm_thermal_utility && $(LOCAL_MAKE)
 	cp device/intel/civ/host/backend/thermal/vm_thermal_utility/thermsys $(PRODUCT_OUT)/scripts/
 
+.PHONY: rtc-monitor
+rtc-monitor:
+	cd device/intel/civ/host/rtc-monitor && $(LOCAL_MAKE)
+	cp device/intel/civ/host/rtc-monitor/guest_rtc_monitor $(PRODUCT_OUT)/scripts/
+
 .PHONY: host-pkg
-host-pkg: em-host-utilities vinput-manager
+host-pkg: em-host-utilities vinput-manager rtc-monitor