diff --git a/device.mk b/device.mk
index 4b8d1fb9237bcfa056ae3d1e428732403e2d89b5..c621aec91dc8e286f658e6da10b04494d53ec9e6 100644
--- a/device.mk
+++ b/device.mk
@@ -24,7 +24,7 @@ PRODUCT_PACKAGES += \
libaudiofoundation.vendor \
libtinycompress \
tinymix \
- android.hardware.audio@5.0.vendor
+ android.hardware.audio@5.0.vendor \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_device.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_device.xml \
@@ -318,6 +318,7 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
# RRO Overlays
PRODUCT_PACKAGES += \
GS290NoCutoutOverlay \
+ CarrierConfigOverlayGS290
# Screen density
PRODUCT_AAPT_CONFIG := normal
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 43c6280f6faa1b7826efddc360c3975a626125cf..d329c5b86e7aa2b578df53e91d059221eec4f6ec 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -182,16 +182,6 @@
- ehrpd:4094,87380,1048576,4096,16384,262144
-
- true
-
-
- true
-
true
@@ -215,9 +205,6 @@
true
-
- true
-
true
diff --git a/rootdir/etc/init.mt6763.rc b/rootdir/etc/init.mt6763.rc
index adc906605452219ae0529d71c448bc5b7c69ee08..abcbe1865bbe57f09fdf1a24f27141b4013ff8a4 100644
--- a/rootdir/etc/init.mt6763.rc
+++ b/rootdir/etc/init.mt6763.rc
@@ -850,6 +850,11 @@ on property:sys.boot_completed=1
write /dev/stune/top-app/schedtune.prefer_idle 0
write /dev/stune/rt/schedtune.prefer_idle 0
+ # Force Disable VOLTE/VT/WFC Support
+ setprop persist.dbg.volte_avail_ovr 0
+ setprop persist.dbg.vt_avail_ovr 0
+ setprop persist.dbg.wfc_avail_ovr 0
+
# restore perf. parameters
write /proc/perfmgr/boost_ctrl/cpu_ctrl/boot_freq "-1 -1 -1 -1"
# restore vcore parameters
diff --git a/rro_overlays/CarrierConfigOverlayGS290/Android.bp b/rro_overlays/CarrierConfigOverlayGS290/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..46d8de8b83b8659c8b987baa84b6545a2862d415
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlayGS290/Android.bp
@@ -0,0 +1,7 @@
+runtime_resource_overlay {
+ name: "CarrierConfigOverlayGS290",
+ theme: "CarrierConfigOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ aaptflags: ["--keep-raw-values"],
+}
diff --git a/rro_overlays/CarrierConfigOverlayGS290/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlayGS290/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9636030e5e5312ad8e28eae4051e47939cfb89f
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlayGS290/AndroidManifest.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/rro_overlays/CarrierConfigOverlayGS290/res/xml/vendor_oppo.xml b/rro_overlays/CarrierConfigOverlayGS290/res/xml/vendor_oppo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..87cdb2926c1540eccac2a7de1711f154734d0713
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlayGS290/res/xml/vendor_oppo.xml
@@ -0,0 +1,921 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.google.android.ims
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 41919
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index 35794ca387fac546d3ed9f913ac5da72fc5fb1a7..8664f67ee35389311eb3a958b26e8993c5a938e1 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -1 +1,2 @@
system_public_prop(vendor_fm_prop)
+vendor_internal_prop(vendor_dbg_ims_prop)
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index e0359adcbc416ab05c07de8d576582517e6ed063..eb402370d13a6e132c4833cd4e0f28a33e311b96 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,3 +1,8 @@
persist.vendor.connsys.fm_chipid u:object_r:vendor_fm_prop:s0
persist.vendor.connsys.fm_50khz_support u:object_r:vendor_fm_prop:s0
persist.vendor.connsys.fm_short_antenna_support u:object_r:vendor_fm_prop:s0
+
+# VOLTE/VT/WFC Debug props
+persist.dbg.volte_avail_ovr u:object_r:vendor_dbg_ims_prop:s0
+persist.dbg.vt_avail_ovr u:object_r:vendor_dbg_ims_prop:s0
+persist.dbg.wfc_avail_ovr u:object_r:vendor_dbg_ims_prop:s0
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 5284e9be198488a2f0c8d8c5738cedd874d7e06e..d218c30e08bcc02da81aa4bac8926f2df668fd65 100644
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -1 +1,2 @@
allow vendor_init device:file { create write };
+set_prop(vendor_init, vendor_dbg_ims_prop)
diff --git a/vendor.prop b/vendor.prop
index 9a37365317958ffcc5f72ece11e5f80e3347dfd3..3163f69d2a354024580a3e2c9a94865e8a1c18f4 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -77,9 +77,6 @@ persist.vendor.volte_support=1
persist.vendor.mtk.volte.enable=1
persist.vendor.vilte_support=1
persist.vendor.viwifi_support=1
-persist.dbg.volte_avail_ovr=1
-persist.dbg.vt_avail_ovr=1
-persist.dbg.wfc_avail_ovr=1
# LMK
ro.lmk.downgrade_pressure=60