ASB Dec 2025 Security Patches integration

aosp_diff/preliminary/build/release/0001-Update-RELEASE_PLATFORM_SECURITY_PATCH-string.patch

@@ -20,7 +20,7 @@ index 4075b588..985e7b01 100644
  name: "RELEASE_PLATFORM_SECURITY_PATCH"
  value: {
 -  string_value: "2025-03-05"
-+  string_value: "2025-11-01"
++  string_value: "2025-12-01"
  }
 -- 
 2.34.1

aosp_diff/preliminary/build/release/0002-Clean-up-sqlite-flags-in-24Q3.bulletin.patch

@@ -0,0 +1,35 @@
+From 21e0356e18f7488c1803e2340000b02494d366c8 Mon Sep 17 00:00:00 2001
+From: Lee Shombert <shombert@google.com>
+Date: Mon, 18 Aug 2025 08:55:50 -0700
+Subject: [PATCH] Clean up sqlite flags in 24Q3
+
+This removes the sqlite trunk-stable flags from the build/release
+directories in 24Q3.  These directories are used in 25Q2 and later but
+not in 24Q3.  The flag values are removed to avoid confusion.
+
+Tested by booting an image on cuttlefish and verifying that the
+sqlite version ws 3.44.5.
+
+Flag: RELEASE_PACKAGE_LIBSQLITE3
+Bug: 430889718
+Bug: 281064726
+Test: presubmit
+Change-Id: I5f7183f2222638beb6a8067dead7f935b4848a11
+---
+ .../trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto        | 4 ----
+ 1 file changed, 4 deletions(-)
+ delete mode 100644 flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
+
+diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
+deleted file mode 100644
+index bb903b8d..00000000
+--- a/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
++++ /dev/null
+@@ -1,4 +0,0 @@
+-name: "RELEASE_PACKAGE_LIBSQLITE3"
+-value: {
+-  string_value: "3440300"
+-}
+-- 
+2.51.2.1006.ga50a493c49-goog
+

aosp_diff/preliminary/cts/0001-Track-DNG-SDK-1-7-1-API-changes.bulletin.patch

@@ -0,0 +1,121 @@
+From 710c53b4c71495ba646646ba11510f423ae458e7 Mon Sep 17 00:00:00 2001
+From: John Reck <jreck@google.com>
+Date: Wed, 25 Jun 2025 14:18:45 -0700
+Subject: [PATCH] Track DNG SDK 1.7.1 API changes
+
+966e57a9a04b3dc56de8230e4c02d73ac46c01b2
+
+Bug: 412662901
+Test: make
+Change-Id: I11050ac5461b13a65fd6d69b4607ffc9ab3fba2c
+---
+ .../libctscamera2jni/dng-validate-jni.cpp     | 41 +++++++++----------
+ 1 file changed, 20 insertions(+), 21 deletions(-)
+
+diff --git a/tests/camera/libctscamera2jni/dng-validate-jni.cpp b/tests/camera/libctscamera2jni/dng-validate-jni.cpp
+index 186cf3f3b97..e6bb3aab406 100644
+--- a/tests/camera/libctscamera2jni/dng-validate-jni.cpp
++++ b/tests/camera/libctscamera2jni/dng-validate-jni.cpp
+@@ -234,7 +234,7 @@ static dng_error_code dng_validate(const void* data, uint32_t count) {
+
+                 // Skip preview if writing a compresssed main image to save space
+                 // in this example code.
+-                if (negative->RawJPEGImage() != NULL && previewIndex > 0) {
++                if (negative->RawLossyCompressedImage() != NULL && previewIndex > 0) {
+                     break;
+                 }
+
+@@ -265,8 +265,8 @@ static dng_error_code dng_validate(const void* data, uint32_t count) {
+
+                 // If we have compressed JPEG data, create a compressed thumbnail.  Otherwise
+                 // save a uncompressed thumbnail.
+-                bool useCompressedPreview = (negative->RawJPEGImage() != NULL) ||
+-                        (previewIndex > 0);
++                bool useCompressedPreview =
++                        (negative->RawLossyCompressedImage() != NULL) || (previewIndex > 0);
+
+                 AutoPtr<dng_preview> preview (useCompressedPreview ?
+                         (dng_preview *) new dng_jpeg_preview :
+@@ -287,7 +287,7 @@ static dng_error_code dng_validate(const void* data, uint32_t count) {
+
+                 if (!useCompressedPreview) {
+                     dng_image_preview *imagePreview = static_cast<dng_image_preview *>(preview.Get());
+-                    imagePreview->fImage.Reset(previewImage.Release());
++                    imagePreview->SetImage(host, previewImage.Release());
+                 } else {
+                     dng_jpeg_preview *jpegPreview = static_cast<dng_jpeg_preview *>(preview.Get());
+                     int32 quality = (previewIndex == 0 ? 8 : 5);
+@@ -308,12 +308,8 @@ static dng_error_code dng_validate(const void* data, uint32_t count) {
+                 dng_timer timer("Write DNG time");
+                 dng_image_writer writer;
+
+-                writer.WriteDNG(host,
+-                        stream2,
+-                        *negative.Get(),
+-                        &previewList,
+-                        dngVersion_Current,
+-                        false);
++                writer.WriteDNG(host, stream2, *negative.Get(), &previewList,
++                                dngVersion_SaveDefault, false);
+             }
+
+             gDumpDNG.Clear();
+@@ -351,6 +347,8 @@ static dng_error_code dng_validate(const void* data, uint32_t count) {
+             if (negative->GetXMP()) {
+                 negative->GetXMP()->RemoveProperties(XMP_NS_CRS);
+                 negative->GetXMP()->RemoveProperties(XMP_NS_CRSS);
++                negative->GetXMP()->RemoveProperties(XMP_NS_CRD);
++                negative->GetXMP()->RemoveProperties(XMP_NS_CRLCP);
+             }
+ #endif
+
+@@ -358,17 +356,18 @@ static dng_error_code dng_validate(const void* data, uint32_t count) {
+             dng_file_stream stream2(gDumpTIF.Get(), true);
+
+             {
++                const dng_camera_profile *profilePtr = nullptr;
++                dng_camera_profile profile;
++                if (!negative->IsMonochrome()) {
++                    const auto &profileID = render.CameraProfileID();
++                    if (negative->GetProfileByID(profileID, profile)) profilePtr = &profile;
++                }
+                 dng_timer timer("Write TIFF time");
+                 dng_image_writer writer;
+
+-                writer.WriteTIFF(host,
+-                        stream2,
+-                        *finalImage.Get(),
+-                        finalImage->Planes() >= 3 ? piRGB
+-                        : piBlackIsZero,
+-                        ccUncompressed,
+-                        negative.Get(),
+-                        &render.FinalSpace());
++                writer.WriteTIFF(host, stream2, *finalImage.Get(),
++                                 finalImage->Planes() >= 3 ? piRGB : piBlackIsZero, ccUncompressed,
++                                 &negative->Metadata(), &render.FinalSpace(profilePtr));
+             }
+             gDumpTIF.Clear();
+         }
+@@ -432,7 +431,7 @@ Java_android_hardware_camera2_cts_DngCreatorTest_validateDngNative(
+         ALOGE("Error reading from dng_validate output pipe: %d", errno);
+         return JNI_FALSE;
+     }
+-    close(pipeFds[1]);
++    close(pipeFds[0]);
+
+     std::string line;
+     int lineCount = 0;
+@@ -457,8 +456,8 @@ Java_android_hardware_camera2_cts_DngCreatorTest_validateDngNative(
+         }
+     }
+     // If no output is produced, assume something went wrong
+-    if (lineCount < 3) {
+-        ALOGE("Validation output less than expected!");
++    if (lineCount > 0) {
++        ALOGE("Unexpected stderr output!");
+         dng_err = dng_error_unknown;
+     }
+     if (dng_err != dng_error_none) {
+-- 
+2.51.2.1006.ga50a493c49-goog
+