Initial unified commit for Android 14, with "light" GSI target
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
From 6ac3e22846c212278b9870f045bb9491c8f5e3a3 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Wed, 21 Sep 2022 13:36:07 +0000
|
||||
Subject: [PATCH 1/2] Exclude TrebleApp & co.
|
||||
|
||||
Change-Id: Ieb62801a79c6e015634fd58b654c63c1de5aef7e
|
||||
---
|
||||
overlay.mk | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/overlay.mk b/overlay.mk
|
||||
index a1de82b..a7fc18a 100644
|
||||
--- a/overlay.mk
|
||||
+++ b/overlay.mk
|
||||
@@ -1,7 +1,4 @@
|
||||
PRODUCT_PACKAGES += \
|
||||
- HardwareOverlayPicker \
|
||||
- QtiAudio \
|
||||
- TrebleApp \
|
||||
treble-overlay-NavBar \
|
||||
treble-overlay-NightMode \
|
||||
treble-overlay-SystemUI-FalseLocks \
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
From ea0f9443f862e2059cef4c3f8f64707d1d3ff46c Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Tue, 11 Oct 2022 10:53:34 +0000
|
||||
Subject: [PATCH 2/2] Enable IMS overlays statically on QCOM/MTK devices
|
||||
|
||||
Change-Id: I851cf859328cc431e8bb163297c33837d4270f58
|
||||
---
|
||||
CAF-IMS/AndroidManifest.xml | 8 ++++----
|
||||
CAF-IMS/res/values/config.xml | 4 ++--
|
||||
MTK-IMS/AndroidManifest.xml | 8 ++++----
|
||||
MTK-IMS/res/values/config.xml | 8 +++++---
|
||||
Telephony/CAF-IMS/AndroidManifest.xml | 6 ++++--
|
||||
Telephony/CAF-IMS/res/values/config.xml | 2 +-
|
||||
Telephony/MTK-IMS/AndroidManifest.xml | 6 ++++--
|
||||
Telephony/MTK-IMS/res/values/config.xml | 3 +--
|
||||
8 files changed, 25 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/CAF-IMS/AndroidManifest.xml b/CAF-IMS/AndroidManifest.xml
|
||||
index 47236c6..5376fb8 100644
|
||||
--- a/CAF-IMS/AndroidManifest.xml
|
||||
+++ b/CAF-IMS/AndroidManifest.xml
|
||||
@@ -3,8 +3,8 @@
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<overlay android:targetPackage="android"
|
||||
- android:requiredSystemPropertyName="persist.sys.phh.ims.caf"
|
||||
- android:requiredSystemPropertyValue="true"
|
||||
- android:priority="39"
|
||||
- android:isStatic="true" />
|
||||
+ android:requiredSystemPropertyName="ro.hardware"
|
||||
+ android:requiredSystemPropertyValue="qcom"
|
||||
+ android:priority="39"
|
||||
+ android:isStatic="true" />
|
||||
</manifest>
|
||||
diff --git a/CAF-IMS/res/values/config.xml b/CAF-IMS/res/values/config.xml
|
||||
index 1af87c7..5b85ebd 100644
|
||||
--- a/CAF-IMS/res/values/config.xml
|
||||
+++ b/CAF-IMS/res/values/config.xml
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
- <string name="config_ims_package">org.codeaurora.ims</string>
|
||||
- <bool name="config_dynamic_bind_ims">true</bool>
|
||||
+ <string name="config_ims_package">org.codeaurora.ims</string>
|
||||
+ <bool name="config_dynamic_bind_ims">true</bool>
|
||||
<bool name="config_carrier_volte_available">true</bool>
|
||||
<bool name="config_device_volte_available">true</bool>
|
||||
<bool name="config_device_wfc_ims_available">true</bool>
|
||||
diff --git a/MTK-IMS/AndroidManifest.xml b/MTK-IMS/AndroidManifest.xml
|
||||
index 96ba83e..33132cc 100644
|
||||
--- a/MTK-IMS/AndroidManifest.xml
|
||||
+++ b/MTK-IMS/AndroidManifest.xml
|
||||
@@ -3,8 +3,8 @@
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<overlay android:targetPackage="android"
|
||||
- android:requiredSystemPropertyName="persist.sys.phh.ims.mtk"
|
||||
- android:requiredSystemPropertyValue="true"
|
||||
- android:priority="79"
|
||||
- android:isStatic="true" />
|
||||
+ android:requiredSystemPropertyName="ro.hardware"
|
||||
+ android:requiredSystemPropertyValue="+mt6*"
|
||||
+ android:priority="79"
|
||||
+ android:isStatic="true" />
|
||||
</manifest>
|
||||
diff --git a/MTK-IMS/res/values/config.xml b/MTK-IMS/res/values/config.xml
|
||||
index f5e0486..2d49a11 100644
|
||||
--- a/MTK-IMS/res/values/config.xml
|
||||
+++ b/MTK-IMS/res/values/config.xml
|
||||
@@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
- <string name="config_ims_package">com.mediatek.ims</string>
|
||||
- <bool name="config_carrier_volte_available">true</bool>
|
||||
- <bool name="config_dynamic_bind_ims">true</bool>
|
||||
+ <string name="config_ims_package">com.mediatek.ims</string>
|
||||
+ <bool name="config_dynamic_bind_ims">true</bool>
|
||||
+ <bool name="config_carrier_volte_available">true</bool>
|
||||
+ <bool name="config_device_volte_available">true</bool>
|
||||
+ <bool name="config_device_wfc_ims_available">true</bool>
|
||||
</resources>
|
||||
diff --git a/Telephony/CAF-IMS/AndroidManifest.xml b/Telephony/CAF-IMS/AndroidManifest.xml
|
||||
index 2267406..365525c 100644
|
||||
--- a/Telephony/CAF-IMS/AndroidManifest.xml
|
||||
+++ b/Telephony/CAF-IMS/AndroidManifest.xml
|
||||
@@ -3,6 +3,8 @@
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<overlay android:targetPackage="com.android.phone"
|
||||
- android:priority="79"
|
||||
- />
|
||||
+ android:requiredSystemPropertyName="ro.hardware"
|
||||
+ android:requiredSystemPropertyValue="qcom"
|
||||
+ android:priority="79"
|
||||
+ android:isStatic="true" />
|
||||
</manifest>
|
||||
diff --git a/Telephony/CAF-IMS/res/values/config.xml b/Telephony/CAF-IMS/res/values/config.xml
|
||||
index 565ee42..ddf685d 100644
|
||||
--- a/Telephony/CAF-IMS/res/values/config.xml
|
||||
+++ b/Telephony/CAF-IMS/res/values/config.xml
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
- <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
|
||||
+ <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
|
||||
</resources>
|
||||
diff --git a/Telephony/MTK-IMS/AndroidManifest.xml b/Telephony/MTK-IMS/AndroidManifest.xml
|
||||
index 5afe885..644d06b 100644
|
||||
--- a/Telephony/MTK-IMS/AndroidManifest.xml
|
||||
+++ b/Telephony/MTK-IMS/AndroidManifest.xml
|
||||
@@ -3,6 +3,8 @@
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<overlay android:targetPackage="com.android.phone"
|
||||
- android:priority="79"
|
||||
- />
|
||||
+ android:requiredSystemPropertyName="ro.hardware"
|
||||
+ android:requiredSystemPropertyValue="+mt6*"
|
||||
+ android:priority="79"
|
||||
+ android:isStatic="true" />
|
||||
</manifest>
|
||||
diff --git a/Telephony/MTK-IMS/res/values/config.xml b/Telephony/MTK-IMS/res/values/config.xml
|
||||
index ead0cc2..01eca95 100644
|
||||
--- a/Telephony/MTK-IMS/res/values/config.xml
|
||||
+++ b/Telephony/MTK-IMS/res/values/config.xml
|
||||
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
- <string name="config_ims_mmtel_package">com.mediatek.ims</string>
|
||||
-
|
||||
+ <string name="config_ims_mmtel_package">com.mediatek.ims</string>
|
||||
</resources>
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Reference in New Issue
Block a user