Merge tag 'android-security-16.0.0_r3' into staging/lineage-23.0_merge-android-security-16.0.0_r3
Android security 16.0.0 release 3
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS3ZNQAKCRDorT+BmrEO
# eC8tAJ4gVg2WXTrPiWkiyZgZcAdGRoI2qQCeIRYP8ORUw5kDB6ZN/6v5vU55Mt4=
# =fnSd
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec 1 20:06:45 2025 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]
# By Manish Singh (1) and Ram Mohan M (1)
# Via Android Build Coastguard Worker
* tag 'android-security-16.0.0_r3':
C2SoftDav1dDec: configure decoder to output only one layer in SVC mode
Add notice of requesting source code in media and media swcodec
Change-Id: I0e9011d1a6ca36c0bc20ac63f6d7c953f5d87ba9
diff --git a/apex/Android.bp b/apex/Android.bp
index 30b359d..5c1a55a 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -86,6 +86,10 @@
manifest: "manifest.json",
defaults: ["com.android.media-defaults"],
prebuilts: ["current_sdkinfo"],
+ licenses: [
+ "frameworks_av_license",
+ "opensourcerequest",
+ ],
}
linker_config {
@@ -250,6 +254,10 @@
name: "com.android.media.swcodec",
manifest: "manifest_codec.json",
defaults: ["com.android.media.swcodec-defaults"],
+ licenses: [
+ "frameworks_av_license",
+ "opensourcerequest",
+ ],
}
apex_key {
diff --git a/media/codec2/components/dav1d/C2SoftDav1dDec.cpp b/media/codec2/components/dav1d/C2SoftDav1dDec.cpp
index 622823c..9421244 100644
--- a/media/codec2/components/dav1d/C2SoftDav1dDec.cpp
+++ b/media/codec2/components/dav1d/C2SoftDav1dDec.cpp
@@ -547,6 +547,7 @@
Dav1dSettings lib_settings;
dav1d_default_settings(&lib_settings);
+ lib_settings.all_layers = 0;
int cpu_count = GetCPUCoreCount();
lib_settings.n_threads = std::max(cpu_count / 2, 1); // use up to half the cores by default.