tree 576f9e0c7c4786de71d0c20a327f590646efa065
parent 0fe41564a389a6aa14b740c7d9332c6b89e82456
parent 910fc4b0a7282c6fcdfd4fc971149e7f685b361c
author Michael Bestas <mkbestas@lineageos.org> 1733864958 +0200
committer Michael Bestas <mkbestas@lineageos.org> 1733864958 +0200
mergetag object 910fc4b0a7282c6fcdfd4fc971149e7f685b361c
 type commit
 tag android-15.0.0_r6
 tagger The Android Open Source Project <initial-contribution@android.com> 1733438642 -0800
 
 Android 15.0.0 Release 6 (AP4A.241205.013)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
 eMnTAJ0WqPXhGqlukPWjtdbffpwES/OgvACfZfv7vak9Lgex8R6zONV9iZzQ+gw=
 =vYjQ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdYrgAXHG1rYmVzdGFz
 QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmmPBw/8CSD3A7O/c+Qh8WeyU0z8k+Un
 hnzL2ZvNdFc6BJCKy0p1ekeKLlCaSJLv7/rS7GEShZq7+A56MlSNd3ELLbq9R4uO
 ELMGqXQxxVJEslw0VCuI8Jh33k5N7hzeRI+/Rq0CPZNYUOicRGImAIMXrmNCaGc/
 XzUB94dq3rxXcDnf+VDbzIY0Q0287mlF99l6ssIf2NQdmeeZTHQxwjJ1ALMn4k5B
 jmErRjB+mlM3nSEJbIG0mLqf4I8ObPxMvQfCwFKz5CCeSaCxPJr0upvnnB3XtgP7
 1Sa/OAyBPxyX3PzS94HDwWym8HjuLfdI4kGWhjTqFYBSUdMpjvGTaQwYKgTaDe9T
 Om6my21OgZ6mNiWYeWCS4Lh98Ug8GcjR/dUaFRG4B7BsACdRktG64QF4ZpFaOwvM
 SBf4qKyfuipd6a10ZjsEeXf1V7E3yx3RzhkJCF9o5ftmvhlNWrhtCp6Z0hOvR5w2
 UI1+rT1LvxN7vmMr3ACsmW471vuyyPaiy6CTigE/w4N/LSR+WO1zIv6kTmuwI733
 upEb7gMy9T5bS9MiOTTVP0nQWalGseQ3ZGFANjwYPY/+kaVehPLdyrp+buBj/MWT
 MfOX6D4Ieu4WU76Z1vyh9YQx9c4tMFQa4oiV2OmlEq8uruKNnTTPQKqTc7WPycTj
 hfSexR8aG9v4Fdkip8E=
 =TXvT
 -----END PGP SIGNATURE-----

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eMnTAJ0WqPXhGqlukPWjtdbffpwES/OgvACfZfv7vak9Lgex8R6zONV9iZzQ+gw=
# =vYjQ
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2473 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Anvesh Renikindi (9) and others
# Via Automerger Merge Worker (120) and others
* tag 'android-15.0.0_r6': (69 commits)
  Revert "add new dependency"
  add new dependency
  Add android.hardware.wifi.supplicant-V4-java to allowed_deps
  Add android.hardware.wifi.supplicant-V4-java to allowed_deps
  [Ranging] Add framework-ranging to allowed deps
  min_sdk_version of tempfile increased.
  build/allowed_deps.txt: add libaom_sve2
  build/allowed_deps.txt: add libaom_sve
  build/allowed_deps.txt: add libaom_neon_i8mm
  The new version of tempfile has some new dependencies.
  Added gson deps for Adservices
  wifi: Upgrade hostapd/vendor HAL aidl version
  Allow exporting app function flags for PermissionController
  Update allow_deps.txt for ipmemorystore-aidl-interfaces-V11-java
  Make java_sdk_library dependencies explicit
  Adapt to module rename.
  Revert "build/allowed_deps.txt: add libaom_neon_i8mm"
  Add mainline modules apex_defaults for b-launched-apex-module
  Allow VDM aconfig flag
  Add networkstack-aidl-interfaces-V22-java to allowed_deps.
  ...

 Conflicts:
	build/allowed_deps.txt

Change-Id: I58435a885a7179ae37125f10241f85f6e5fdce89