-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO
eCszAKCDPz9XHfGe8MRVWRzNq2pXdXVF0QCbBl0InY10bs/yticTO7E4W1RxUWE=
=J+Dk
-----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
+rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQANlQ2btTS0n2YdrvKk3D4kWbUY6HRHGqEzeECpZ4glbhl4335hV9PrxnCyC2mIGEZ
ME6pr+cH7LSVMGMTbuAwY=
-----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
# eCszAKCDPz9XHfGe8MRVWRzNq2pXdXVF0QCbBl0InY10bs/yticTO7E4W1RxUWE=
# =J+Dk
# -----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 Piotr Klasa (4) and others
# Via Android (Google) Code Review (32) and others
* tag 'aml_tz6_351400020': (42 commits)
zumapro: fine tune c2.android.av1-dav1d.decoder for 25Q1
Use 2025-03-01 deqp level for GLES
Use 2025-03-01 deqp levels for Vulkan
Revert "Use 2025-03-01 deqp levels for GLES and Vulkan"
Use 2025-03-01 deqp levels for GLES and Vulkan
init.zumapro.soc.rc: Delete rampup and util_est setup
move common init perf settings to gs_common
Include 16k board config only when 16k kernel exist
Revert "move common init perf settings to gs_common"
Revert "Revert "16KB: zumapro: Move copy_efs_file_to_data script..."
Revert "16KB: zumapro: Move copy_efs_file_to_data script to gs-c..."
16KB: zumapro: Move copy_efs_file_to_data script to gs-common
Revert^2 "Move 16 KB dev option configs"
Revert "Move 16 KB dev option configs"
thermal: support low power mode prop switch
Move 16 KB dev option configs
move common init perf settings to gs_common
Reject e911 call during non-emergency satellite session.
Disable NFC during satellite
zumapro: Clean up dbc and pm properties.
...
Conflicts:
overlay/frameworks/base/core/res/res/values/config.xml
Change-Id: I31ce98a3f878176cc1e03a3709fe68e8f62d932a
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fKCAAKCRDorT+BmrEO
eGxiAJ9kdOB3bGMC2D+BZ2qX44tDh4U6UwCfZVmV34e2iZoBr1HUvv+PFbdBh44=
=aWWI
-----END PGP SIGNATURE-----
gpgsig -----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ
+rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQFSO/dKxh4Sd8uhs5QJzCKI6gvYCc8lwQ9mQNatuwPvUcY0egzeoXFaHBFWB6GGqYj
I2JQr0ogw7/XpRnzDYOA8=
-----END SSH SIGNATURE-----
Merge tag 'android-15.0.0_r21' into staging/lineage-22.2_merge-android-15.0.0_r21
Android 15.0.0 Release 21 (BP1A.250305.020)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8fKCAAKCRDorT+BmrEO
# eGxiAJ9kdOB3bGMC2D+BZ2qX44tDh4U6UwCfZVmV34e2iZoBr1HUvv+PFbdBh44=
# =aWWI
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Mar 5 05:50:32 2025 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]
# By Rick Yiu (8) and others
# Via Android (Google) Code Review (59) and others
* tag 'android-15.0.0_r21': (83 commits)
Reject e911 call during non-emergency satellite session.
dump_power: add battery caretaker dump into bugreport
[Pixel VPN] Apply reviewed default permissions
Configure satellite NIDD APN name for Zuma pro devices
Add country codes of Canda and EU countries to the satellite allowed list
Add enhanced geofencing data and satelltie access config json for Zuma Pro
Add enhanced geofencing data and satelltie access config json for Zuma Pro
modem_svc: use modem_svc_sit version sepolicy
Set permission for rampup_multiplier
Use SCHED_QOS_SENSITIVE_EXTREME_SET for InputPolicy
Add SCHED_QOS_POWER_EFFICIENCY profiles
update health HAL dependency
Add `config_satellite_carrier_roaming_esos_provisioned_class` for the intent to trigger satellite provisioning
Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zumapro
Add `config_satellite_allow_tn_scanning_during_satellite_session` flag.
Fix kasan logic
Clean up unnecessary data_connection_5g_plus overlay
Vibrator: Update compatability matrix
[NTN][VZW P2P] Add config to enable sending check message datagrams when satellite modem is not connected.
init: zuma: move sched rate limit to late init
...
Change-Id: I9c4e0b550fe27df45e16097bc061315b1219da26
Revert submission 31488081-deqp-2025-03-01
Reason for revert: Droidmonitor created revert due to b/393355394. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:31488081-deqp-2025-03-01
Change-Id: Ia4a5ab47858b95d6c8c1d31305ff41183dd029ba
Revert submission 31155502-move_copy_efs_script
Reason for revert: Droidmonitor created revert due to b/390502519. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:31155502-move_copy_efs_script
Change-Id: Ic090ed513bffba5abcea6e56194af71c41e880b2
AAOS_on_phone targets need to override these properties, without
that builds will fail.
Bug: 377689604
Test: local build
Change-Id: I5eef2b081da846813106ea282c38685046848be7
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
eCS1AKCAqQqQ2PZ/HMIFuzLZPWfZjvCRDACeJWblhIHa+ODC9PYstxkKALZVXCo=
=E9VY
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7PoXHG1rYmVzdGFz
QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmlTuBAAss0qZU+h9oujq988gz6/SCTb
Np3yMsknkUSdP9RcKm7qJBXpcdntcVtfUUyrOQ0Ki0myfdokSd8IMtZ0zFUewbiv
QPpQJzt89htSwVsYIdnDJP9voegljkSLMSBCSiEg5uF+oW4uS2GFEtr/uDYHnAnX
JmdrEps/Qreu42Zwgw9cItb1gQUzu9WNeRK53cy28TmTzPbx43nho0SYOs6sCDPN
+2kk9EIRBZpPSh5bJB6Mqu2A5vSLqzM0YfX98iFQfWpfrOYlpFt1uKwI5SP9bu4L
HSJRaSzIugentYQC89dWb2NLuFTWKgsWHSoCt9iqc4i8CDOkpOFv/Jw6xZM9HlPm
Kk64SeiuCvqrg3rLz/muMae7bpNI2GHs3g3aSk7ibfcG4gCNmYzqXlyUI5jawRrQ
wnbXflME2BIlfG0xGbqXh5lj+xK5DrsNRuyVZVlu0orw8RI3ZqrpCv7Bd6SI6vpM
Gys+gR572DfO50OmuE7KzfV0OP6PLymM9/zxnK43qKLkaJ8yWruvpgtUlDcB85ed
86FUe2iAhvQU+t88M/nC0YBR+PptB4HrlMLyUoRgfb6odq+kmqKfL620pmIKWssG
qvs4boCVzvCzaNxJJj1bvFutB3get/0W0+PK8kWXiLnnVOheV8TsSnBonDXxfSOw
S2KzBh/EIh+j/ICOces=
=ELmX
-----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
# eCS1AKCAqQqQ2PZ/HMIFuzLZPWfZjvCRDACeJWblhIHa+ODC9PYstxkKALZVXCo=
# =E9VY
# -----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 Juan Yescas (14) and others
# Via Android (Google) Code Review (81) and others
* tag 'android-15.0.0_r6': (118 commits)
Set auto prefer idle task name
Set priority task name
Change permission of fg_wi file nodes
Delete TARGET_CPU_VARIANT_RUNTIME.
Force EST loopback for hidden menu testing
Add input event profile to mitigate input latency of input threads
Control the "init_dpm.sh" to be built in zumapro devices
[ZumaPro] Change default MTE mode to Asymm.
usb: modify initial_descriptor_timeout to 500ms
Control the modules built from vendor/google_devices/zumapro/prebuilts/gpu
Revert "Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by de..."
Revert "Disable EHLD"
zumapro: avoid vector<const T>
16kb: Select proper fstab for targets that only boot 16kb kernels
16kb: Set f2fs block size to 16384 for targets that only boot 16kb kernels
16kb: Config fstab for targets that only boot 16kb kernels
Deprecate preloaded_nanoapps.json
Delete PRODUCT_FULL_TREBLE_OVERRIDE.
Control GoogleDialer built from zumapro/proprietary/GoogleDialer
Add pixellogger with non radio
...
Change-Id: I8b9080bd2f089873aa4f2845913c2cf24d7a6857
Bug: 362312117
Flag: EXEMPT 'config change'
Test: Manually verified if the enhanced geofence file is working well
with the satellite_access_config.json file.
Change-Id: I9a27b9bc67dcd5d48e4487b1af973847b3a0912c
For solving sepolicy conflicts for different AP version, modem_svc_sit will support devices from gs101 to zuma_pro.
Bug: 372400955
Change-Id: I926fe12be95f10a2c4db13c06dab8b1586f9dcc8
Flag: NONE local testing only
For zumapro it shares the same libacryl_plugins in zuma but for
libexynosdisplay it still has different version between zuma and
zumapro. Add zumapro's own libexynosdisplay for zumapro.
Bug: 357500180
Test: lunch aosp_caiman-trunk_staging-userdebug; \
m libexynosdisplay
Flag: EXEMPT refactor
Change-Id: Iaf07baa8bb93ee6cd3da01e4b50231b7f5023fe9
This will only enable RE-Graphite for stages where the rollout aconfig
flag introduced in I30a59986d1da2dc8355c2b3cf2da436c6cc64120 is also
enabled (and if the force_compile_renderengine_graphite read-only flag
is also enabled.)
Rollout proposal discussed w/ Pixel Graphics leads out of band.
Bug: 380460068
Test: manual validation that RE-Graphite is only enabled w/ aconfig flag
Flag: com.android.graphics.surfaceflinger.flags.graphite_renderengine_preview_rollout
Change-Id: I29bade2e024771b2800ab23236ddab4b12d9425b
This is to include the time required for AOC SSR and restart when
AOC reset and re-establish transport to finish queued commands.
This will also match the Pixel Watch HCI timeout value.
Flag: EXEMPT bugfix
Bug: 375044749
Test: build, verify on device, presubmit
Change-Id: I18fffdee2a38d784165c048d8adf9edbd0019cfc
Since our feature is not ready, we utilize build flag we applied for this project to project this undone feature built accidentally on other targets.
Test: Run test `UpdatableCrashingBootTest` on caiman `trunk_staging`, `trunk_food` and `next` targets with go/forrest (https://android-build.corp.google.com/builds/abtd/run/L28000030007788752, https://android-build.corp.google.com/builds/abtd/run/L64100030007774323).
Test: Build and flash caiman with `trunk_staging` as target, GIA is up and running.
Flag: build.RELEASE_PIXEL_GIA_ENABLED
Bug: 378865024
Change-Id: Iffa7f11659ece8c0210023630568cdc45132840f
Signed-off-by: Kai Hsieh <kaihsieh@google.com>
Revert submission 30378113-revert-29512389-gia-PMLMEKURMT
Reason for revert: Revert to fix the issue that GIA cannot be started in caimen-next-userdbg
Reverted changes: /q/submissionid:30378113-revert-29512389-gia-PMLMEKURMT
Bug: 367881686
Change-Id: I74a61360d09f85a2404d884090fd2bedb1be4030
Revert submission 29512389-gia
Reason for revert: <Potential culprit for b/378865024 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Reverted changes: /q/submissionid:29512389-gia
Change-Id: Ic00760e1dfa0c23f76b1539b717aa2db2a552971
Root casue: there is no GTI built on ripcurrentpro devices. Solution: Add GTI for ripcurrentpro devices.
Test: go/forrest can successfully build for ripcurrentpro and on CM devices: https://android-build.corp.google.com/builds/abtd/run/L56200030007746343.
Bug: 378811601
Flag: build.RELEASE_PIXEL_GIA_ENABLED
Change-Id: If8a248b1f8f9a9cd82ea1a26aeb5244ec1de12bc
Signed-off-by: Kai Hsieh <kaihsieh@google.com>
The HAL service is needed for Updatable pVMs
Bug: 376015522
Test: get_build_var SECRETKEEPER_ENABLED
Test: VtsSecretkeeperTargetTest
Test: #UpgradedPackageIsAcceptedWithSecretkeeper
Change-Id: Ic1993de0f82feba0979e0403472ed4da79676137
Bug: 367881686
Test: Manually, build and flash the ROM and use `service list` to make sure the service is up.
Flag: build.RELEASE_PIXEL_GIA_ENABLED
Change-Id: Icfeb3d1707ead79f38e355d4502c24f1b5493a26
Signed-off-by: Kai Hsieh <kaihsieh@google.com>
