From fea3b59554787e2873db480c3421e8939cd3e24e Mon Sep 17 00:00:00 2001
From: orges <me@orgesified.ml>
Date: Sun, 11 Jul 2021 20:43:04 +0000
Subject: [PATCH] manifest: Update to android-11.0.0_r39

Change-Id: I7ad893f1c9138503fc727d2178093d1d833f9bc0
---
 aospa.xml   | 8 ++++++++
 default.xml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/aospa.xml b/aospa.xml
index cf5c866..edbdace 100644
--- a/aospa.xml
+++ b/aospa.xml
@@ -167,6 +167,10 @@
   <remove-project name="platform/packages/services/Telephony" />
   <project path="packages/services/Telephony" name="AOSPA/android_packages_services_Telephony" remote="aospa" />
 
+  <!-- Packages (AOSP) -->
+  <remove-project name="platform/packages/modules/NetworkStack" />
+  <project path="packages/modules/NetworkStack" name="platform/packages/modules/NetworkStack" remote="aosp" />
+
   <!-- Packages (AOSPA) -->
   <project path="packages/apps/ParanoidDoze" name="AOSPA/android_packages_apps_ParanoidDoze" remote="aospa" />
   <project path="packages/apps/ParanoidHub" name="AOSPA/android_packages_apps_ParanoidHub" remote="aospa" />
@@ -219,6 +223,8 @@
   <!-- System (AOSP) -->
   <remove-project name="platform/system/apex" />
   <project path="system/apex" name="platform/system/apex" remote="aosp" />
+  <remove-project name="platform/system/libfmq" />
+  <project path="system/libfmq" name="platform/system/libfmq" remote="aosp" />
 
   <!-- Tools (AOSPA) -->
   <project path="tools/extract-utils" name="AOSPA/android_tools_extract-utils" remote="aospa" />
@@ -233,6 +239,8 @@
   <project path="vendor/qcom/sdclang" name="proprietary_vendor_qcom_sdclang" remote="blobs" revision="ruby-12" />
 
   <!-- Vendor (CAF) -->
+  <remove-project name="platform/vendor/qcom-opensource/packages/apps/Bluetooth" />
+  <project path="vendor/qcom/opensource/commonsys/packages/apps/Bluetooth" name="AOSPA/android_vendor_qcom-opensource_packages_apps_Bluetooth" remote="aospa" />
   <remove-project name="platform/vendor/qcom-opensource/system/bt" />
   <project path="vendor/qcom/opensource/commonsys/system/bt" name="AOSPA/android_vendor_qcom_opensource_commonsys_system_bt" remote="aospa" />
   <remove-project name="platform/vendor/qcom-opensource/bluetooth-commonsys-intf" />
diff --git a/default.xml b/default.xml
index d108d3a..e967858 100644
--- a/default.xml
+++ b/default.xml
@@ -5,7 +5,7 @@
   <remote name="aosp"
           fetch="https://android.googlesource.com"
           review="https://android-review.googlesource.com/"
-          revision="refs/tags/android-11.0.0_r38"/>
+          revision="refs/tags/android-11.0.0_r39"/>
 
   <!-- CAF -->
   <remote name="caf_system"