-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
eCi5AKCHAzJVFdsm++eJGXcPb6LbaKIGTQCcDiWODLyLOWCK64nt7tfCwTgUFCE=
=3OQU
-----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
+rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQGzx1CwS4pcfih6dNJzdvsHLng+4M9qD8N/OatGRRJF0ck6x3Qwifdp45ItOlU7d0T
52HZvmRrb/FCpQQR9Z/QE=
-----END SSH SIGNATURE-----
Merge tag 'aml_tz6_351400020' into staging/lineage-23.0_merge-aml_tz6_351400020
aml_tz6_351400020 (13155446,com.google.android.go.tzdata6,com.google.android.tzdata6)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
# eCi5AKCHAzJVFdsm++eJGXcPb6LbaKIGTQCcDiWODLyLOWCK64nt7tfCwTgUFCE=
# =3OQU
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar 18 02:18:39 2025 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]
# By Jaegeuk Kim (6) and others
# Via Android (Google) Code Review (55) and others
* tag 'aml_tz6_351400020': (74 commits)
Fix comment
Adjust the version set in manifest xml and matrix xml
Add astd sepolicy to gs-common for P26 factory builds
Allow tachyon service to make binder calls to gca
display: add drm_atomic_state to debug-build bugreport
init.pixel-perf.rc: Setup default rampup multiplier and util_est
Allow write for restorecon
Dump F2FS disk_map and UFS phy version
Fix UFS err_stats
Fix selinux permission denials
move common init perf settings to gs_common
Revert "Set up access control rule for aocxd"
16KB: Move CopyEfsTest to device/google/gs-common
Revert^2 "Add Bluetooth extension HAL - CCO"
gs-common: wlc: add tx update permission for hal_googlebattery
Revert "Add Bluetooth extension HAL - CCO"
storage: fix userdata_exp.ai partition selinux error
Revert "move common init perf settings to gs_common"
insmod-sh: Allow writing to kmsg
RamdumpService: Fix the SELinux errors from introducing Firebase Analytics.
...
Conflicts:
display/dump_pixel_display.mk
Change-Id: Iaa05ef7e62a7b8320f320ad4db482998863fe136
Bug: 361443653
Test: m and build pass
Flag: EXEMPT, this feature is related to CS which is controlled
by com.android.bluetooth.flags.channel_sounding_in_stack
Change-Id: I2f2f46cfd15ce0104a6309c8032f7f4ef5ba267a
This reverts commit 3e78c36e5f.
Reason for revert: build break
ERROR: files are incompatible: The following instances are in the device manifest but not specified in framework compatibility matrix:
vendor.google.bluetooth_ext.IBluetoothCco/default (@1)
Bug: 361443653
Change-Id: I59f325ad1d8af5fca54cc9bb8a6208c5c8c20939
This reverts commit b25c089c59.
Reason for revert: For now, adding Cco results in VTS failed, need to modify the version as well. We'll modify both this CL and aidl version in xml after we enable Cco.
Bug: 361443653
Change-Id: Ib4f84c749f626d3274eba4ad63ecca366715d128
Bug: 361443653
Test: build pass
Flag: EXEMPT, this feature is related to CS which is controlled
by com.android.bluetooth.flags.channel_sounding_in_stack
Change-Id: I92d27664c05ed1c2ec043b9b2efa186ff5405170
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec=
=JvPS
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7O4XHG1rYmVzdGFz
QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnGCw//XCwIcPsFqQSwygK76wo5ZsCO
Mex6U5SdmtBecQ2VmIZKofe4/HIog9Wne3GFE6Xjj1bZHxtp/W4uURp6BQ8LuqA5
zqhkzc/Ijz6W+8wJ7n4k+V+N33N9ZYrbxQdqmBbMzLO0kOv86vC0HbKHLLgvT5d4
yYTe3TmGUMXTysky8+Y5YJoIHXqy847ohsOg7yzo9wtEzNZpDXLjDCfp4H8Gei8c
RIw/g+P2WwXGEntlXMtt6lajLF5m2GOtGLL5S+IrtoskpISC6jOmnD+WDwG8VJRW
dts4yqRtB47uz53sLE618zOXE/Tz3Akppq73bJ9I5dk3qHCx7NBVy5HLFE8O6rJL
KVjMj88sMShd4wMbHEy+Sh0jVlcKXuxFJeU0MZ0bqoM5/MDDZXQvJDOOQK7noQHS
RGnsXFwgZnLZEW375FJv4T8S19logSJqAYEkjSdrzU3oIUZqNgFHqQcGDLC8ukOc
79PbK53RvmzyEedYonH7Zn/ImGwmJxlyVey5jFX+O1S9RsVD4AyrgT1dn3s0KniK
1UiPi7sHBsL2yE4rp63UEysFZU9uj2gy3xf4PxBi97LV7mLUfE2YqsDwOrII82Ao
xjyEKTxSMADdwHHI15yf52eNRCf3eBakL54TbZZJ184FZYeTGvOpvc5yCuiITqm9
RauADk94HVdaaMJXyk4=
=l74W
-----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+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec=
# =JvPS
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec 6 00:44:01 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 2483 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 Randall Huang (12) and others
# Via Android (Google) Code Review (58) and others
* tag 'android-15.0.0_r6': (91 commits)
gsc: Change the criteria for building GSC targets
sepolicy: remove irregular policy
Revert^2 "Allow devices that use HIDL to find AIDL radio_ext_service"
Revert "Allow devices that use HIDL to find AIDL radio_ext_service"
gs-common: add rules for euiccpixel_app
audio: allow set_prop for vendor_audio_prop_restricted
Allow devices that use HIDL to find AIDL radio_ext_service
Add sepolicy for NNAPI HAL to access hal_graphics_allocator_service, This is required for AHardwareBuffer allocation.
storage: fix ota selinux error
Storage: add sepolicy for recovery mode
Add sepolicy for gcam app
check_current_prebuilt: Symlink current prebuilt folder to android root
shamp: Update shared_modem_platform HAL version to 3
dumpstate: gsa: Add GSA logs to dumpstate
storage: fix vendor_init avc denied
storage: fix vold avc denied
storage: fix adb bugreport and refactor the existing rules
storage: fix PowerStats avc denied
storage: move sepolicy to common folder
shamp: Update shared_modem_platform HAL version to 2
...
Conflicts:
camera/lyric.mk
storage/init.storage.rc
Change-Id: I5ed6cff3b54261c949ec6ba60b32820b264b4ec2
Bug: 353618079
Test: m
Test: make bt crash and check bugreport
Flag: NONE not related to logic change
Change-Id: I20a7e5b27b64f40ffa7ae3ced38f4044f2bf64b9
This reverts commit e7edc9e446.
Reason for revert: Probable culprit for b/320755845. Will be running through ABTD for confirming and before submitting the revert.
Change-Id: Id989e182396c498afd3f15b70977ba5fba22c557
