From 73601ea5bbf797478d133e8cc4731bae6a869483 Mon Sep 17 00:00:00 2001
From: Yuan Si <do4suki@gmail.com>
Date: Tue, 6 Feb 2024 07:23:32 +0800
Subject: [PATCH] manifest: Update to the February 2024 SPL

Change-Id: I1c39ea4a0d9640fa1ac1a478ef668405d6b7350b
Signed-off-by: Yuan Si <do4suki@gmail.com>
---
 aosp.xml  | 2 --
 aospa.xml | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/aosp.xml b/aosp.xml
index 92b8ea0..4b9e7d2 100644
--- a/aosp.xml
+++ b/aosp.xml
@@ -59,8 +59,6 @@
   <project path="packages/modules/AppSearch" name="platform/packages/modules/AppSearch" remote="aosp" />
   <remove-project name="platform/packages/modules/IntentResolver" />
   <project path="packages/modules/IntentResolver" name="platform/packages/modules/IntentResolver" remote="aosp" />
-  <remove-project name="platform/packages/modules/Permission" />
-  <project path="packages/modules/Permission" name="platform/packages/modules/Permission" remote="aosp" />
   <remove-project name="platform/packages/modules/SdkExtensions" />
   <project path="packages/modules/SdkExtensions" name="platform/packages/modules/SdkExtensions" remote="aosp" />
   <remove-project name="platform/packages/modules/Virtualization" />
diff --git a/aospa.xml b/aospa.xml
index 7c9d313..45ef32d 100644
--- a/aospa.xml
+++ b/aospa.xml
@@ -139,8 +139,12 @@
   <project path="packages/modules/Connectivity" name="aospa-staging/android_packages_modules_Connectivity" remote="aospa" />
   <remove-project name="platform/packages/modules/common" />
   <project path="packages/modules/common" name="AOSPA/android_packages_modules_common" remote="aospa" />
+  <remove-project name="platform/packages/modules/Permission" />
+  <project path="packages/modules/Permission" name="aospa-staging/android_packages_modules_Permission" remote="aospa" />
   <remove-project name="platform/packages/modules/Wifi" />
   <project path="packages/modules/Wifi" name="aospa-staging/android_packages_modules_Wifi" remote="aospa" />
+  <remove-project name="platform/packages/providers/DownloadProvider" />
+  <project path="packages/providers/DownloadProvider" name="aospa-staging/android_packages_providers_DownloadProvider" remote="aospa" />
   <remove-project name="platform/packages/providers/MediaProvider" />
   <project path="packages/providers/MediaProvider" name="AOSPA/android_packages_providers_MediaProvider" remote="aospa" />
   <remove-project name="platform/packages/providers/TelephonyProvider" />
@@ -158,7 +162,7 @@
 
   <!-- System -->
   <remove-project name="platform/system/core" />
-  <project path="system/core" name="AOSPA/android_system_core" remote="aospa" />
+  <project path="system/core" name="aospa-staging/android_system_core" remote="aospa" />
   <remove-project name="platform/system/chre" />
   <project path="system/chre" name="AOSPA/android_system_chre" remote="aospa" />
   <remove-project name="platform/system/libhidl" />