Merge branch 'LMODroid:thirteen' into thirteen

AmogOS-Rom · Dec 6, 2023 · 604672e · 604672e
2 parents 40d8745 + beb27e6
commit 604672e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/snippets/lineage.xml b/snippets/lineage.xml
@@ -215,6 +215,7 @@
 
     <!-- Packages -->
     <project path="packages/apps/Car/Settings" name="android_packages_apps_Car_Settings" remote="lineage" />
+    <project path="packages/apps/KeyChain" name="android_packages_apps_KeyChain" groups="pdk-fs" remote="lineage" />
     <project path="packages/apps/LineageCustomizer" name="android_packages_apps_LineageCustomizer" remote="lineage" />
     <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" groups="apps_nfc,pdk-fs" remote="lineage" />
     <project path="packages/apps/Seedvault" name="android_packages_apps_Seedvault" remote="lineage" />
@@ -231,7 +232,6 @@
     <project path="packages/providers/CallLogProvider" name="android_packages_providers_CallLogProvider" groups="pdk-fs" remote="lineage" />
     <project path="packages/providers/ContactsProvider" name="android_packages_providers_ContactsProvider" groups="pdk-cw-fs,pdk-fs" remote="lineage" />
     <project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" groups="pdk-cw-fs,pdk-fs" remote="lineage" />
-    <project path="packages/providers/TelephonyProvider" name="android_packages_providers_TelephonyProvider" groups="pdk-cw-fs,pdk-fs" remote="lineage" />
     <project path="packages/services/Mms" name="android_packages_services_Mms" groups="pdk-cw-fs,pdk-fs" remote="lineage" />
     <project path="packages/services/Telephony" name="android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" remote="lineage" />
 

diff --git a/snippets/lmodroid.xml b/snippets/lmodroid.xml
@@ -89,9 +89,12 @@
     <project path="packages/modules/adb" name="LMODroid/platform_packages_modules_adb" remote="lmodroid" />
     <project path="packages/modules/Bluetooth" name="LMODroid/platform_packages_modules_Bluetooth" remote="lmodroid" />
     <project path="packages/modules/Connectivity" name="LMODroid/platform_packages_modules_Connectivity" remote="lmodroid" />
+    <project path="packages/modules/DnsResolver" name="LMODroid/platform_packages_modules_DnsResolver" remote="lmodroid" />
+    <project path="packages/modules/StatsD" name="LMODroid/platform_packages_modules_StatsD" remote="lmodroid" />
     <project path="packages/modules/Wifi" name="LMODroid/platform_packages_modules_Wifi" remote="lmodroid" />
     <project path="packages/overlays/LMODroid" name="LMODroid/platform_packages_overlays_LMODroid" remote="lmodroid" />
     <project path="packages/providers/MediaProvider" name="LMODroid/platform_packages_providers_MediaProvider" remote="lmodroid" />
+    <project path="packages/providers/TelephonyProvider" name="LMODroid/platform_packages_providers_TelephonyProvider" remote="lmodroid" />
     <project path="packages/resources/devicesettings" name="LMODroid/platform_packages_resources_devicesettings" remote="lmodroid" />
     <project path="packages/services/AlternativeNetworkAccess" name="LMODroid/platform_packages_services_AlternativeNetworkAccess" remote="lmodroid" />
     <project path="packages/services/Telecomm" name="LMODroid/platform_packages_services_Telecomm" remote="lmodroid" />
@@ -102,6 +105,7 @@
     <project path="prebuilts/lmodroid" name="LMODroid/platform_prebuilts_lmodroid" remote="lmodroid" />
 
     <!-- System -->
+    <project path="system/ca-certificates" name="LMODroid/platform_system_ca-certificates" remote="lmodroid" />
     <project path="system/core" name="LMODroid/platform_system_core" remote="lmodroid" />
     <project path="system/netd" name="LMODroid/platform_system_netd" remote="lmodroid" />
 

diff --git a/snippets/remove.xml b/snippets/remove.xml
@@ -120,6 +120,7 @@
     <remove-project name="platform/packages/apps/Dialer" />
     <remove-project name="platform/packages/apps/Gallery2" />
     <remove-project name="platform/packages/apps/ImsServiceEntitlement" />
+    <remove-project name="platform/packages/apps/KeyChain" />
     <remove-project name="platform/packages/apps/Launcher3" />
     <remove-project name="platform/packages/apps/Nfc" />
     <remove-project name="platform/packages/apps/ManagedProvisioning" />
@@ -138,8 +139,10 @@
     <remove-project name="platform/packages/modules/Bluetooth" />
     <remove-project name="platform/packages/modules/common" />
     <remove-project name="platform/packages/modules/Connectivity" />
+    <remove-project name="platform/packages/modules/DnsResolver" />
     <remove-project name="platform/packages/modules/NeuralNetworks" />
     <remove-project name="platform/packages/modules/Permission" />
+    <remove-project name="platform/packages/modules/StatsD" />
     <remove-project name="platform/packages/modules/Virtualization" />
     <remove-project name="platform/packages/modules/Wifi" />
     <remove-project name="platform/packages/providers/BlockedNumberProvider" />
@@ -160,6 +163,7 @@
 
     <!-- System-->
     <remove-project name="platform/system/apex" />
+    <remove-project name="platform/system/ca-certificates" />
     <remove-project name="platform/system/core" />
     <remove-project name="platform/system/extras" />
     <remove-project name="platform/system/keymaster" />