From 701b3036a9bcaa0d7de90b3282b9dbc7d51a946f Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 10 Dec 2023 04:33:20 +0200
Subject: [PATCH] manifest: December 2023 Quarterly Platform Release and
 Security update

Platform: android-14.0.0_r14 -> android-14.0.0_r17
gs201: android-14.0.0_r0.17 -> android-14.0.0_r0.25
Change-Id: I11c3252e2af8d0eeac43f9f2c8824015d4776fff
---
 default.xml          | 12 ++++----
 snippets/lineage.xml |  2 +-
 snippets/pixel.xml   | 70 ++++++++++++++++++++++----------------------
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/default.xml b/default.xml
index 684def56..d1b9bd05 100644
--- a/default.xml
+++ b/default.xml
@@ -11,14 +11,14 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="android-review.googlesource.com"
-           revision="refs/tags/android-14.0.0_r14" />
+           revision="refs/tags/android-14.0.0_r17" />
 
   <default revision="refs/heads/lineage-21.0"
            remote="github"
            sync-c="true"
            sync-j="4" />
 
-  <superproject name="platform/superproject" remote="aosp" revision="android-14.0.0_r14" />
+  <superproject name="platform/superproject" remote="aosp" revision="android-14.0.0_r17" />
   <contactinfo bugurl="go/repo-bug" />
 
   <!-- AOSP Projects -->
@@ -98,8 +98,8 @@
   <project path="external/arm-trusted-firmware" name="platform/external/arm-trusted-firmware" groups="pdk" remote="aosp" />
   <project path="external/auto" name="platform/external/auto" groups="pdk" remote="aosp" />
   <project path="external/autotest" name="platform/external/autotest" groups="pdk-fs" remote="aosp" />
-  <project path="external/android-nn-driver" name="LineageOS/android_external_android-nn-driver" groups="pdk-lassen,pdk-gs-arm" />
-  <project path="external/armnn" name="LineageOS/android_external_armnn" groups="pdk-lassen,pdk-gs-arm" />
+  <project path="external/android-nn-driver" name="platform/external/android-nn-driver" groups="pdk-lassen,pdk-gs-arm" remote="aosp" />
+  <project path="external/armnn" name="platform/external/armnn" groups="pdk-lassen,pdk-gs-arm" remote="aosp" />
   <project path="external/avb" name="LineageOS/android_external_avb" groups="pdk" />
   <project path="external/bazelbuild-rules_android" name="platform/external/bazelbuild-rules_android" groups="pdk" remote="aosp" />
   <project path="external/bazelbuild-kotlin-rules" name="platform/external/bazelbuild-kotlin-rules" groups="pdk" remote="aosp" />
@@ -293,6 +293,7 @@
   <project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="pdk" remote="aosp" />
   <project path="external/libkmsxx" name="platform/external/libkmsxx" groups="pdk" remote="aosp" />
   <project path="external/libldac" name="platform/external/libldac" groups="pdk" remote="aosp" />
+  <project path="external/libmonet" name="platform/external/libmonet" groups="pdk,sysui-studio" remote="aosp" />
   <project path="external/libmpeg2" name="platform/external/libmpeg2" groups="pdk" remote="aosp" />
   <project path="external/libnetfilter_conntrack" name="platform/external/libnetfilter_conntrack" groups="pdk" remote="aosp" />
   <project path="external/libnfnetlink" name="platform/external/libnfnetlink" groups="pdk" remote="aosp" />
@@ -839,6 +840,7 @@
   <project path="hardware/google/graphics/common" name="LineageOS/android_hardware_google_graphics_common" groups="pdk-lassen,pdk-gs-arm" />
   <project path="hardware/google/graphics/gs101" name="platform/hardware/google/graphics/gs101" groups="pdk-lassen,pdk-gs-arm" remote="aosp" />
   <project path="hardware/google/graphics/gs201" name="platform/hardware/google/graphics/gs201" groups="cloudripper" remote="aosp" />
+  <project path="hardware/google/graphics/zuma" name="platform/hardware/google/graphics/zuma" groups="ripcurrent" remote="aosp" />
   <project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk" remote="aosp" />
   <project path="hardware/google/pixel" name="LineageOS/android_hardware_google_pixel" groups="generic_fs,pixel" />
   <project path="hardware/google/pixel-sepolicy" name="LineageOS/android_hardware_google_pixel-sepolicy" groups="generic_fs,pixel" />
@@ -912,7 +914,6 @@
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
   <project path="packages/apps/Browser2" name="platform/packages/apps/Browser2" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/Camera2" name="LineageOS/android_packages_apps_Camera2" groups="pdk-fs" />
-  <project path="packages/apps/Car/Calendar" name="platform/packages/apps/Car/Calendar" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/Car/Cluster" name="platform/packages/apps/Car/Cluster" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/Car/DebuggingRestrictionController" name="platform/packages/apps/Car/DebuggingRestrictionController" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/Car/DialerPrebuilt" name="platform/packages/apps/Car/DialerPrebuilt" groups="pdk-fs" remote="aosp" />
@@ -965,6 +966,7 @@
   <project path="packages/apps/Traceur" name="platform/packages/apps/Traceur" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/Trebuchet" name="LineageOS/android_packages_apps_Trebuchet" groups="pdk-fs" />
   <project path="packages/apps/TvSettings" name="LineageOS/android_packages_apps_TvSettings" groups="pdk-fs" />
+  <project path="packages/apps/TvSystemUI" name="platform/packages/apps/TvSystemUI" groups="pdk-fs" remote="aosp" />
   <project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk" remote="aosp" />
   <project path="packages/apps/UniversalMediaPlayer" name="platform/packages/apps/UniversalMediaPlayer" remote="aosp" />
   <project path="packages/apps/WallpaperPicker" name="platform/packages/apps/WallpaperPicker" groups="pdk-fs" remote="aosp" />
diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index c523704f..61312c14 100644
--- a/snippets/lineage.xml
+++ b/snippets/lineage.xml
@@ -79,7 +79,7 @@
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9" groups="pdk,linux,arm" clone-depth="1" revision="lineage-19.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9" groups="pdk,linux,arm" clone-depth="1" revision="lineage-19.1" />
   <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_x86_x86_64-linux-android-4.9" groups="pdk,linux,x86" clone-depth="1" revision="lineage-19.1" />
-  <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
+  <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
   <project path="prebuilts/tools-lineage" name="LineageOS/android_prebuilts_tools-lineage" clone-depth="1" />
 
   <!-- CodeLinaro additions -->
diff --git a/snippets/pixel.xml b/snippets/pixel.xml
index ca593454..c09beac6 100644
--- a/snippets/pixel.xml
+++ b/snippets/pixel.xml
@@ -2,40 +2,40 @@
 <manifest>
 
   <!-- Pixel 6/6 Pro/6a/7/7 Pro/7a/Tablet/Fold kernel modules -->
-  <project path="kernel/google/gs201/private/devices/google/bluejay" name="kernel/devices/google/bluejay" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/devices/google/felix" name="kernel/devices/google/felix" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/devices/google/lynx" name="kernel/devices/google/lynx" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/devices/google/tangorpro" name="kernel/devices/google/tangorpro" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/amplifiers" name="kernel/google-modules/amplifiers" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/aoc" name="kernel/google-modules/aoc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/bluetooth/qcom" name="kernel/google-modules/bluetooth/qcom" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/bluetooth/synaptics" name="kernel/google-modules/bluetooth/synaptics" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/bms" name="kernel/google-modules/bms" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/display" name="kernel/google-modules/display" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/edgetpu/abrolhos" name="kernel/google-modules/edgetpu/abrolhos" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/edgetpu/janeiro" name="kernel/google-modules/edgetpu/janeiro" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/fingerprint/fpc" name="kernel/google-modules/fingerprint/fpc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/gpu" name="kernel/google-modules/gpu" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/gxp/gs201" name="kernel/google-modules/gxp/gs201" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/lwis" name="kernel/google-modules/lwis" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/nfc" name="kernel/google-modules/nfc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/power/reset" name="kernel/google-modules/power/reset" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/sensors/hall_sensor" name="kernel/google-modules/sensors/hall_sensor" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/common" name="kernel/google-modules/touch/common" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/focaltech" name="kernel/google-modules/touch/focaltech_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/goodix" name="kernel/google-modules/touch/goodix_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/novatek" name="kernel/google-modules/touch/novatek_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/touch/synaptics" name="kernel/google-modules/touch/synaptics_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/uwb" name="kernel/google-modules/uwb" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/video/gchips" name="kernel/google-modules/video/gchips" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/wlan/dhd43752p" name="kernel/google-modules/wlan/syna/dhd43752p" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/wlan/wcn6740/cnss2" name="kernel/google-modules/wlan/qcom/wcn6740/cnss2" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/wlan/wcn6740/wlan" name="kernel/google-modules/wlan/qcom/wcn6740/wlan" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
-  <project path="kernel/google/gs201/private/google-modules/wlan/wlan_ptracker" name="kernel/google-modules/wlan/wlan_ptracker" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.17" />
+  <project path="kernel/google/gs201/private/devices/google/bluejay" name="kernel/devices/google/bluejay" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/devices/google/felix" name="kernel/devices/google/felix" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/devices/google/lynx" name="kernel/devices/google/lynx" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/devices/google/tangorpro" name="kernel/devices/google/tangorpro" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/amplifiers" name="kernel/google-modules/amplifiers" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/aoc" name="kernel/google-modules/aoc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/aoc_ipc" name="kernel/google-modules/aoc-ipc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/bluetooth/broadcom" name="kernel/google-modules/bluetooth/broadcom" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/bluetooth/qcom" name="kernel/google-modules/bluetooth/qcom" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/bluetooth/synaptics" name="kernel/google-modules/bluetooth/synaptics" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/bms" name="kernel/google-modules/bms" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/display" name="kernel/google-modules/display" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/edgetpu/abrolhos" name="kernel/google-modules/edgetpu/abrolhos" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/edgetpu/janeiro" name="kernel/google-modules/edgetpu/janeiro" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/fingerprint/fpc" name="kernel/google-modules/fingerprint/fpc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/gpu" name="kernel/google-modules/gpu" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/gxp/gs201" name="kernel/google-modules/gxp/gs201" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/lwis" name="kernel/google-modules/lwis" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/nfc" name="kernel/google-modules/nfc" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/power/reset" name="kernel/google-modules/power/reset" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/sensors/hall_sensor" name="kernel/google-modules/sensors/hall_sensor" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/common" name="kernel/google-modules/touch/common" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/focaltech" name="kernel/google-modules/touch/focaltech_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/fts" name="kernel/google-modules/touch/fts_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/goodix" name="kernel/google-modules/touch/goodix_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/novatek" name="kernel/google-modules/touch/novatek_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/sec" name="kernel/google-modules/touch/sec_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/touch/synaptics" name="kernel/google-modules/touch/synaptics_touch" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/uwb" name="kernel/google-modules/uwb" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/video/gchips" name="kernel/google-modules/video/gchips" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/wlan/bcmdhd4389" name="kernel/google-modules/wlan/bcmdhd/bcm4389" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/wlan/dhd43752p" name="kernel/google-modules/wlan/syna/dhd43752p" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/wlan/wcn6740/cnss2" name="kernel/google-modules/wlan/qcom/wcn6740/cnss2" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/wlan/wcn6740/wlan" name="kernel/google-modules/wlan/qcom/wcn6740/wlan" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
+  <project path="kernel/google/gs201/private/google-modules/wlan/wlan_ptracker" name="kernel/google-modules/wlan/wlan_ptracker" groups="pixel-extra" remote="aosp" revision="refs/tags/android-14.0.0_r0.25" />
 
 </manifest>