-----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
They are now in a common init file.
Bug: 335874870
Flag: EXEMPT not supported for init.rc files
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I926ffd1cb01b8ee331737c0c335da67eefe76bcc
compared to ag/31352563 I did not transfer the settings for "write /sys/devices/system/cpu/cpuidle/current_governor teo", which caused the problem
Test: Verified if all values of transferred settings are as they should be after rebooting the device, and and checked that there are no new selinux errors for hal_power_default, verified all metrics that caused power regression in the previous commit on abtd
Bug: 335874870
Flag: EXEMPT not supported by this component yet
Change-Id: If0bdfb529d60633cc5623120eed720c421a735fb
Add lower power mode property toggle to switch thermal hal config
Bug: 363070211
Test: toggle property to confirm thermal config switch
Flag: EXEMPT test only
Change-Id: I932c8d29e2a0eb939ab8f8f7c4c79d02153f49eb
Test: Verified if all values of transferred settings are as they should be after rebooting the device, and and checked that there are no new selinux errors for hal_power_default
Bug: 335874870
Flag: EXEMPT not supported by this component yet
Change-Id: I8b65fa99dfc84f7d676eba1449a0d32b7d1be846
Bug: 335874870
Test: Checked that permissions and values for all affected files are correct (ls -l, cat)
Flag: EXEMPT not supported by this component yet
Change-Id: I56f8ac747a97e866e2a663ab70c141871330ec8f
-----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
Since pixel performance has a shared configuration,
we need to move override values into late init.
Bug: 381100494
Test: Boot
Flag: EXEMPT bug fix
Change-Id: I359c33622f18c9345ee3f250ca5d5c61bc1440cc
Re-land after making SELinux corrections.
35162f9a7c
Bug: 335874870
Flag: NONE code refactor
Test: Boot and check parameters
Signed-off-by: Will Song <jinpengsong@google.com>
Change-Id: I8a7c50d9d4a8e77714a7a87d7d974decdac1e877
This does not convert /metadata to ext4, the default is still f2fs.
EXT4 would only be used if we are on 16KB mode
Flag: EXEMPT bugfix
Bug: 379759696
Change-Id: I854f563ecd49fc3d7d73ede581cf3d3081c5e555
When the modem setup is done is init.efs.rc file,
there is boot time regression in the 4kb configuration.
Bug: 374435821
Flag: EXEMPT bugfix
Test: Build and tested in abtd
Change-Id: I909f9eb45f783fda45e7782419845d236c263aa0
MTE is a low overhead tool which enables detection of memory
safety bugs in interactive workloads. See
https://source.android.com/docs/security/test/memory-safety/arm-mte
for background and information.
This change enables MTE by default on -eng builds. See
go/mte-eng for more information.
Co-authored-by: Evgenii Stepanov <eugenis@google.com>
Test: Device boots and no MTE crashes
Bug: 316398899
Flag: EXEMPT only affects eng builds, not shipping code
Change-Id: I8be52af4f0349907651ae661972c85ea46e2aa72
Enable settings by different groups.
Bug: 355612114
Flag: NONE init rc file does not support flag
Test: build pass
Change-Id: Ic4eccc64797cb6511f5f3c50f9e5a0b8f0791edc
Set InputDispatche and InputReader prefer idle explicitly, which is a
workaround and should be removed after they become ADPF.
Bug: 366146314
Flag: NONE init rc file change does not support flags
Test: tasks set as expected
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76b662b189e0ab7a555d93a8390c792631cc0558)
Merged-In: Ica1cc1bcf44205f6ccfb09529a52107b1c5091b3
Change-Id: Ica1cc1bcf44205f6ccfb09529a52107b1c5091b3
Set InputDispatche and InputReader prefer idle explicitly, which is a
workaround and should be removed after they become ADPF.
Bug: 366146314
Flag: NONE init rc file change does not support flags
Test: tasks set as expected
Change-Id: Ica1cc1bcf44205f6ccfb09529a52107b1c5091b3
There are 4 partitions that are flashed at the factory and use F2FS fs with
4kb block size:
- /dev/block/by-name/efs
- /dev/block/by-name/efs_backup
- /dev/block/by-name/modem_userdata
- /dev/block/by-name/persist
These partitions can NOT be mounted by 16kb kernels because F2FS
expects BLOCK_SIZE == PAGE_SIZE.
In order to access the files in these partitions by 16kb kernels,
the dump.f2fs tool is used.
This change will perform these steps at boot time ONLY for 16kb mode. For
every partition (efs/efs_backup/modem_userdata/persist):
1. Use dump.f2fs to copy the content of the partition
to /data/vendor/copied/<partition name>.img.
2. If the copy was succesfull, rename /data/vendor/copied/<partition name>.img
to /data/vendor/copied/<partition name>
3. fsync the content of the directory /data/vendor/copied/<partition name>.
After the content of the partitions is in /data/vendor/copied,
bind-mount the partitions to the directory /mnt/vendor. See conf/fstab.efs.from_data.
Note: This change ONLY applies to 16kb kernels. This change does not modify
the original partitions.
Bug: 347015136
Bug: 362368691
Test: $ source build/envsetup.sh
$ lunch [zumapro]-trunk_staging-userdebug
$ m
$ ./vendor/google/tools/flashall -w
Flag: EXEMPT bugfix
Change-Id: Idf46a2a3a4f0b2e91ee4a0322a0c469e055684c8
The setup of the persist partition is moved to init.persist.rc.
This will make easier to configure 16kb targets in follow up
changes.
Bug: 347015136
Test: $ source build/envsetup.sh
$ lunch [zumapro]-trunk_staging-userdebug
$ m
$ ./vendor/google/tools/flashall -w
Flag: EXEMPT bugfix
Change-Id: Ifd17fc1f25ea8cf73470630e14a38116e0b7b96a
Update fstab used so that both ext4 and f2fs are supported.
Copying previously release config to zumapro to support pixel
9.
Test: atest Enable16KbTest
Flag: build.RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION
Bug: 347108593
Change-Id: I8da600ac8e91e61abc20a324762f19dddf846851
