From 11bb767c6738c7e4a931d01a0918afa77063952b Mon Sep 17 00:00:00 2001
From: Jake Weinstein <jake@aospa.co>
Date: Sat, 9 Sep 2023 06:17:48 +0900
Subject: [PATCH] manifest: Update to the September 2023 SPL

Change-Id: I9750d7bfb39191eabe0ba373cca9329bc500452c
---
 aosp.xml  | 2 --
 aospa.xml | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aosp.xml b/aosp.xml
index 2fcd564..f0f6234 100644
--- a/aosp.xml
+++ b/aosp.xml
@@ -69,8 +69,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/NeuralNetworks" />
-  <project path="packages/modules/NeuralNetworks" name="platform/packages/modules/NeuralNetworks" 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" />
diff --git a/aospa.xml b/aospa.xml
index 3ac3c73..423fd07 100644
--- a/aospa.xml
+++ b/aospa.xml
@@ -135,8 +135,12 @@
   <project path="packages/modules/Connectivity" name="AOSPA/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/NeuralNetworks" />
+  <project path="packages/modules/NeuralNetworks" name="AOSPA/android_packages_modules_NeuralNetworks" remote="aospa" />
   <remove-project name="platform/packages/modules/Wifi" />
   <project path="packages/modules/Wifi" name="AOSPA/android_packages_modules_Wifi" 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" />
   <project path="packages/providers/TelephonyProvider" name="AOSPA/android_packages_providers_TelephonyProvider" remote="aospa" />
   <remove-project name="platform/packages/services/Telecomm" />