From df63f42373f7bf1fdfccfbadfa8d9551948ade0a Mon Sep 17 00:00:00 2001
From: Sean Du <do4suki@gmail.com>
Date: Thu, 26 Jun 2025 22:27:15 +0800
Subject: [PATCH] sm8750-common: Ship ConsumerIR App

Change-Id: Ie4d47ee682da520cecb26b2ea1fd8614d5f5142e
Signed-off-by: Sean Du <do4suki@gmail.com>
Signed-off-by: chandu078 <chandudyavanapelli03@gmail.com>
---
 common.mk                                                    | 3 +++
 configs/oplus-hiddenapi-package-allowlist.xml                | 5 +++++
 .../frameworks/base/core/res/res/values/config.xml           | 5 +++++
 proprietary-files.txt                                        | 5 +++++
 4 files changed, 18 insertions(+)
 create mode 100644 configs/oplus-hiddenapi-package-allowlist.xml

diff --git a/common.mk b/common.mk
index 1cb7f8a..4767014 100644
--- a/common.mk
+++ b/common.mk
@@ -216,6 +216,9 @@ ifneq ($(TARGET_IS_TABLET),true)
 PRODUCT_PACKAGES += \
     android.hardware.ir-service.oplus
 
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/oplus-hiddenapi-package-allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/oplus-hiddenapi-package-allowlist.xml
+
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/android.hardware.consumerir.xml
 endif
diff --git a/configs/oplus-hiddenapi-package-allowlist.xml b/configs/oplus-hiddenapi-package-allowlist.xml
new file mode 100644
index 0000000..39de3c1
--- /dev/null
+++ b/configs/oplus-hiddenapi-package-allowlist.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This XML file declares which platform apps that need to access internal APIs. -->
+<config>
+  <hidden-api-whitelisted-app package="com.oplus.consumerIRApp" />
+</config>
diff --git a/overlay-lineage/frameworks/base/core/res/res/values/config.xml b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
index 7d46c75..2e28aea 100644
--- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
@@ -10,5 +10,10 @@
 
     <!-- Path to fast charging status file to detect whether an oem fast charger is active -->
     <string name="config_oemFastChargerStatusPath" translatable="false">/sys/class/oplus_chg/battery/voocchg_ing</string>
+    
+    <!-- Default value for proximity check on screen wake
+     NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
+    <bool name="config_proximityCheckOnWake">true</bool>
+    <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
 
 </resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3d46edb..ea9236d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -238,6 +238,11 @@ vendor/etc/ssg/ta_config.json
 vendor/etc/ssg/tz_whitelist.json
 vendor/lib64/libtaautoload.so
 
+# ConsumerIR
+my_product/del-app/ConsumerIRApp/ConsumerIRApp.apk:product/app/ConsumerIRApp/ConsumerIRApp.apk;PRESIGNED
+my_stock/etc/asl/com.oplus.consumerIRApp-safetyLabel.xml:product/etc/asl/com.oplus.consumerIRApp-safetyLabel.xml
+
+
 # Data
 vendor/bin/adpl
 vendor/bin/embmsslServer