From fcd22327ed1f15d7fe81a5a4881cdb5ec128b2ac Mon Sep 17 00:00:00 2001
From: LMO GerritBot <gerrit@libremobileos.com>
Date: Thu, 9 Nov 2023 16:42:26 +0000
Subject: [PATCH 1/4] Merge android-13.0.0_r83

android-13.0.0_r75 -> android-13.0.0_r83
Command line: -q -a android-13.0.0_r83
Warnings and errors:
Warning: AOSP remote at URL https://android.googlesource.com/device/gigaset/GS5-unified does not exist
Warning: AOSP remote at URL https://android.googlesource.com/device/mediatek/sepolicy_vndr does not exist
Warning: AOSP remote at URL https://android.googlesource.com/device/volla/mimameid does not exist
Error: Not inside git worktree: /root/lmo13/external/dwarves
[hardware/mediatek] Error: failed to fetch android-13.0.0_r83 from aosp!
Warning: AOSP remote at URL https://android.googlesource.com/kernel/gigaset/mt6768 does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/firmware does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/fxtec/pro1 does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/gigaset/gs290-unified does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/gigaset/GS5 does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/gigaset/gx290-unified does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/gigaset/GX4 does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/gigaset/mt6763-common does not exist
Warning: AOSP remote at URL https://android.googlesource.com/platform/vendor/google/lynx does not exist

Change-Id: I215ef049938dc81b0fe9075ae5aeeff7ae60ac6f
---
 default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.xml b/default.xml
index 8ab582b..8a632f9 100644
--- a/default.xml
+++ b/default.xml
@@ -4,13 +4,13 @@
   <remote name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-13.0.0_r75"
+  <default revision="refs/tags/android-13.0.0_r83"
            remote="aosp"
            sync-j="4"
            sync-c="true"
            sync-f="true" />
 
-  <superproject name="platform/superproject" remote="aosp" revision="android-13.0.0_r75" />
+  <superproject name="platform/superproject" remote="aosp" revision="android-13.0.0_r83" />
   <contactinfo bugurl="go/repo-bug" />
 
   <project path="build/make" name="platform/build" groups="pdk" >

From 03c8d46cabf6b7b8b8dd4a967edb46dfce180c44 Mon Sep 17 00:00:00 2001
From: Nick <nift4@protonmail.com>
Date: Sat, 11 Nov 2023 17:52:54 +0000
Subject: [PATCH 2/4] Revert "Merge android-13.0.0_r83"

This reverts commit fcd22327ed1f15d7fe81a5a4881cdb5ec128b2ac.

Reason for revert: accidentally merged

Change-Id: I969d988af6c3a0e913884e2e2eae76e4bfccf9c2
---
 default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.xml b/default.xml
index 8a632f9..8ab582b 100644
--- a/default.xml
+++ b/default.xml
@@ -4,13 +4,13 @@
   <remote name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-13.0.0_r83"
+  <default revision="refs/tags/android-13.0.0_r75"
            remote="aosp"
            sync-j="4"
            sync-c="true"
            sync-f="true" />
 
-  <superproject name="platform/superproject" remote="aosp" revision="android-13.0.0_r83" />
+  <superproject name="platform/superproject" remote="aosp" revision="android-13.0.0_r75" />
   <contactinfo bugurl="go/repo-bug" />
 
   <project path="build/make" name="platform/build" groups="pdk" >

From e8699c7405176ca2ecf4d798433a87a843455a96 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sat, 11 Nov 2023 20:43:20 +0100
Subject: [PATCH 3/4] Track our own forks for 2023-11 ASB patching

* packages/modules/DnsResolver
* packages/modules/StatsD
* packages/providers/TelephonyProvider
* system/ca-certificates

Change-Id: I6d74b4a3c259cbb738b258c94b4de334e338d6e8
---
 snippets/lineage.xml  | 1 -
 snippets/lmodroid.xml | 4 ++++
 snippets/remove.xml   | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index 7d8412c..b8569db 100644
--- a/snippets/lineage.xml
+++ b/snippets/lineage.xml
@@ -231,7 +231,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
index d2f2215..5b3e122 100644
--- 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
index 1cee35d..07ceb04 100644
--- a/snippets/remove.xml
+++ b/snippets/remove.xml
@@ -138,8 +138,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 +162,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" />

From beb27e676aeab40222e13a4e0f641da3db0eea38 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Thu, 9 Nov 2023 19:45:46 +0200
Subject: [PATCH 4/4] lineage: Sync packages/apps/KeyChain

Change-Id: I8e6f251fcd434960ba97550caa5cf2efdcbcad10
---
 snippets/lineage.xml | 1 +
 snippets/remove.xml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index b8569db..3817c5f 100644
--- 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" />
diff --git a/snippets/remove.xml b/snippets/remove.xml
index 07ceb04..4fe4470 100644
--- 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" />