Eric Biggers
a3ce66437c
Merge "Fix the dm-verity Merkle tree caches to not expire so quickly" into main am: 6dc0ed1758
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3377529
Change-Id: Id336c8aea1a2abf9cf9d8dfbfcf735109f1103d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-02 18:38:10 +00:00
Eric Biggers
6dc0ed1758
Merge "Fix the dm-verity Merkle tree caches to not expire so quickly" into main
2024-12-02 18:11:34 +00:00
Treehugger Robot
7aa226893f
Merge "Update comments to point to the new location of event.logtags." into main am: e7a16c3aa0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376093
Change-Id: Ie9e6be7b00e6a49a0ff4f32bc60066d04e43889d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-02 15:13:49 +00:00
Treehugger Robot
e7a16c3aa0
Merge "Update comments to point to the new location of event.logtags." into main
2024-12-02 14:48:01 +00:00
Dennis Shen
f716e1e0ce
Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: db80953238
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376683
Change-Id: Idfd6463c179d460df776adf024def33a72f66583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 13:48:25 +00:00
Dennis Shen
db80953238
Merge "Deprecate cc_binary aconfigd and the controlling flag" into main
2024-11-27 13:33:23 +00:00
David Drysdale
e59a7fb20c
Merge "Move Trusty C++ KeyMint to v4" into main am: bc6efddf79
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3375712
Change-Id: I47ec3395aaa9a13ce7e8f3bc2ac514d0663f4371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 08:31:21 +00:00
David Drysdale
bc6efddf79
Merge "Move Trusty C++ KeyMint to v4" into main
2024-11-27 07:18:20 +00:00
Treehugger Robot
2809871edc
Merge "libutils OWNERS for shayba@" into main am: 17cd008055
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3378962
Change-Id: Ie9f3f675d4378e3e48052c6261cfb6a90b53f2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 01:13:22 +00:00
Treehugger Robot
17cd008055
Merge "libutils OWNERS for shayba@" into main
2024-11-27 00:28:02 +00:00
Steven Moreland
27dd6f8e62
libutils OWNERS for shayba@
...
For Looper work, but not scoped down to this
unless you want it to be.
Bug: N/A
Test: N/A
Change-Id: I14bf8d21af357ef7b9151cca49b0cf40dde0e3ca
2024-11-26 23:44:17 +00:00
Dennis Shen
52d2446b4e
Deprecate cc_binary aconfigd and the controlling flag
...
cc_binary aconfigd is replaced with rust_binary aconfigd-system. The
replacement is flag guarded and is already in TF full for more than a
week. Thus delete the flag and deprecate old cc_binary aconfigd.
Test: m
Change-Id: Ib128adc2ef8178e02222f77e6b89bcc7ac83c1da
2024-11-26 15:26:52 +00:00
Treehugger Robot
3b4612e7da
Merge "libprefetch: rename property name" into main am: 7c066103a3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376861
Change-Id: I5d4190cb20e59941497893887492dd508c228690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-26 09:03:46 +00:00
Treehugger Robot
7c066103a3
Merge "libprefetch: rename property name" into main
2024-11-26 08:38:29 +00:00
Akilesh Kailash
3df083a498
libprefetch: rename property name
...
Bug: 362507272
Test: Build
Change-Id: I39627fdcbbe5458e6fbc9dfaa1aa620844d56f8b
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-25 21:46:56 -08:00
Eric Lin
9731ea7b67
Update comments to point to the new location of event.logtags.
...
event.logtags was moved from system/core/logcat to system/logging/logcat in Android 12 by aosp/1454058.
Change-Id: Ia3cedee549145eddb0484ec589a9599a156bea14
BUG: 168791309
Flag: DOCS_ONLY
Test: Local build
2024-11-26 04:24:56 +00:00
Eric Biggers
cadad290a7
Fix the dm-verity Merkle tree caches to not expire so quickly
...
Bug: 335233956
Test: cat /sys/module/dm_bufio/parameters/max_age_seconds
Change-Id: I20e4df7dd3eb2ac1f462510e900568e946195faf
2024-11-26 03:24:44 +00:00
Automerger Merge Worker
f6ad6dc896
Merge "Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into android15-tests-dev am: a8537415c1" into main am: f7b584086c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365128
Change-Id: Ibec698c323f0962738a3e952c74001dbadd24bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 22:54:54 +00:00
Automerger Merge Worker
f7b584086c
Merge "Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into android15-tests-dev am: a8537415c1" into main
2024-11-25 22:25:24 +00:00
Treehugger Robot
c1f5c76fa9
Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into android15-tests-dev am: a8537415c1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365128
Change-Id: I12b0472a65d5c11ece024801392cc265cf0c5049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 22:25:19 +00:00
Treehugger Robot
a8537415c1
Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into android15-tests-dev
2024-11-25 22:05:44 +00:00
Dennis Shen
0f3c97ac6a
Merge "move aconfigd platform init service from init.rc into aconfigd.rc" into main am: c532409c5c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3344222
Change-Id: Ia16c72f825d9346fa1c16760250b03346c810573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 17:45:08 +00:00
Dennis Shen
c532409c5c
Merge "move aconfigd platform init service from init.rc into aconfigd.rc" into main
2024-11-25 17:27:03 +00:00
David Drysdale
487584da23
Move Trusty C++ KeyMint to v4
...
- Declare v4 HAL.
- Declare version 400 in Package Manager (when unfrozen).
- Link to current (V4 when unfrozen) versions of support libraries.
- Add `setAdditionalAttestationInfo()` method to HAL service.
- Add `SetAdditionalAttestationInfo()` method to implementation, using
the common message types.
- Add Trusty-specific message code for the
`SET_ADDITIONAL_ATTESTATION_INFO` message exchange.
Test: VtsAidlKeyMintTargetTest (new test fails until TA updated too)
Bug: 369375199
Change-Id: I4699aea3ab8a0723a5c2bc1493f7bbb69cdfd6df
2024-11-25 15:52:31 +00:00
Treehugger Robot
f581beabbd
Merge "Remove /data/apex/hashtree directory" into main am: 1de1f1d83b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3374869
Change-Id: I0486c1067b8d48adb762f55e22457a8653ffe21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 11:05:20 +00:00
Treehugger Robot
1de1f1d83b
Merge "Remove /data/apex/hashtree directory" into main
2024-11-25 10:29:16 +00:00
Jooyung Han
fef2dff80a
Remove /data/apex/hashtree directory
...
This directory is no longer used.
Bug: 184914612
Change-Id: Iaa094e2df39c363fe0a5ffd4b27b5c3075bb4f7f
Test: (device doesn't have the directory)
2024-11-25 08:32:05 +00:00
Treehugger Robot
36252ab703
Merge "libprefetch: Start prefetch service based on build" into main am: 3ffdc6206a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3368783
Change-Id: I8bc54460b5d966b59ab4f3192b7534c4c6b2d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-23 07:14:27 +00:00
Treehugger Robot
3ffdc6206a
Merge "libprefetch: Start prefetch service based on build" into main
2024-11-23 06:40:20 +00:00
Akilesh Kailash
ef3a2c05fe
libprefetch: Start prefetch service based on build
...
1: Check the presence of the file 'prefetch_ready'. If it doesn't
exist then the device is booting for the first time after wipe.
Thus, we would just create the file and exit as we do not want
to initiate the record after data wipe primiarly because boot
after data wipe is long and the I/O pattern during first boot may not actually match
with subsequent boot.
2: If the file 'prefetch_ready' is present:
a: Compare the build-finger-print of the device with the one record format
is associated with by reading the file 'build_finger_print'. If they match,
start the prefetch_replay.
b: If they don't match, then the device was updated through OTA. Hence, start
a fresh record and delete the build-finger-print file. This should also cover
the case of device rollback.
c: If the build-finger-print file doesn't exist, then just restart the record
from scratch.
Bug: 362507272
Test: Prefetch record/replay
Change-Id: I90b861ba9381ddba6ab7dedb9930a735e55b0e5d
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-22 20:49:13 -08:00
Treehugger Robot
33053b6f1a
Merge "Remove |ro.hardware.| prefix in KM VM sys property" into main am: e3db20857f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365402
Change-Id: I9043f942133b1cb1a397beb312f1cf8afdb4dd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-23 01:02:51 +00:00
Treehugger Robot
e3db20857f
Merge "Remove |ro.hardware.| prefix in KM VM sys property" into main
2024-11-23 00:14:01 +00:00
Treehugger Robot
c733a4ed04
Merge "Remove no longer necessary MS_LAZYTIME definitions." into main am: 6ec942a0cb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3370977
Change-Id: Ibdf9ac99295be87e39adc010425144d3f2980a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-22 22:38:37 +00:00
Treehugger Robot
6ec942a0cb
Merge "Remove no longer necessary MS_LAZYTIME definitions." into main
2024-11-22 22:17:22 +00:00
Wei Li
81c9767cf4
Merge "Remove system/core/METADATA" into main am: e400d09c83
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3368403
Change-Id: Ia1faf480ab1976f676f36915a7be385815c055d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-22 17:03:52 +00:00
Wei Li
e400d09c83
Merge "Remove system/core/METADATA" into main
2024-11-22 16:23:30 +00:00
Wei Li
f00efa0242
Remove system/core/METADATA
...
This directory doesn't contain third-party code and it doesn't need a METADATA file.
Bug: 380376695
Test: CIs
Change-Id: Ie197786da09304476fb002b178c2a77d424f5a53
2024-11-22 07:11:11 +00:00
Akilesh Kailash
5374129251
Merge "snapuserd: Lock the buffer during snapshot-merge" into main am: e10fc8369a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3368179
Change-Id: Ie0472d0223fd055885372ab822477c2d1f4e09da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-22 05:19:55 +00:00
Akilesh Kailash
e10fc8369a
Merge "snapuserd: Lock the buffer during snapshot-merge" into main
2024-11-22 04:55:53 +00:00
Shin Kawamura
e4df764401
Merge "Fix permission of zram writeback and idle file" into main am: 640e32478f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3370238
Change-Id: I662f6ebf85c8b21f6fab46c1a23bef78c6cca187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-22 04:24:19 +00:00
Shin Kawamura
640e32478f
Merge "Fix permission of zram writeback and idle file" into main
2024-11-22 03:58:13 +00:00
T.J. Mercier
45a4b6f511
Merge "Reapply "libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS"" into main am: b053403046
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3369297
Change-Id: Ia8fa8d2b8ccf194309e318a0712c98d911aab998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-21 22:31:40 +00:00
T.J. Mercier
b053403046
Merge "Reapply "libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS"" into main
2024-11-21 22:14:07 +00:00
Elliott Hughes
0701fed364
Remove no longer necessary MS_LAZYTIME definitions.
...
Change-Id: Idf2d947509731715f895518b541d55d55187c43d
2024-11-21 18:46:28 +00:00
Akilesh Kailash
17c537e75a
Merge "Add prefetch directory in /metadata" into main am: 0582e461bc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3367707
Change-Id: Ibb9555b9406e34460ee3e656bdc944aceb8ce9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-21 17:48:13 +00:00
Akilesh Kailash
0582e461bc
Merge "Add prefetch directory in /metadata" into main
2024-11-21 17:21:06 +00:00
Akilesh Kailash
35ab96a423
Add prefetch directory in /metadata
...
Bug: 362507272
Test: Verify directory is created in /metadata
Change-Id: Ie1c2312f405d4b41e06a248e4d2b93cd8fc62a93
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-21 05:59:54 -08:00
Shintaro Kawamura
b912e3e548
Fix permission of zram writeback and idle file
...
The default permission of "/sys/block/zram0/idle" and
"/sys/block/zram0/writeback" are "0200".
Adding read permission to the files does not make sense because reading
those files fail as EIO error.
We should keep permission as minimum as possible.
Bug: 117682284
Bug: 375432468
Test: ls -la /sys/block/zram0
Change-Id: I11ed5d9eee257002f4698edcd81de39d2c317ea1
2024-11-21 16:28:34 +09:00
Treehugger Robot
7799804594
Merge "Use genfs labels version library" into main am: 1c1bdd91b3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3364390
Change-Id: I81190c193a0e5e72be12f46da507b03118114683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-21 03:06:13 +00:00
Treehugger Robot
1c1bdd91b3
Merge "Use genfs labels version library" into main
2024-11-21 02:45:16 +00:00