Commit graph

91208 commits

Author SHA1 Message Date
Treehugger Robot
91cee386e5 Merge changes I0586f761,I9fc71f9c,I0ad1f449 into main am: 85050a06e1 am: be00d31ac5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3377032

Change-Id: I453e931f7b63dc958c2b6f7c41839533d7059e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-02 19:45:18 +00:00
Treehugger Robot
be00d31ac5 Merge changes I0586f761,I9fc71f9c,I0ad1f449 into main am: 85050a06e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3377032

Change-Id: I0f691b82207853c7edd53079c91d1c7e38d67c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-02 19:20:44 +00:00
Treehugger Robot
85050a06e1 Merge changes I0586f761,I9fc71f9c,I0ad1f449 into main
* changes:
  libprocessgroup: Remove ramdisk_available from libcgrouprc
  libprocessgroup: Remove vendor_ramdisk_available from libcgrouprc
  libprocessgroup: Remove recovery_available from libcgrouprc
2024-12-02 19:03:46 +00:00
Eric Biggers
cc8f563d02 Merge "Fix the dm-verity Merkle tree caches to not expire so quickly" into main am: 6dc0ed1758 am: a3ce66437c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3377529

Change-Id: Ia69d46ac326a5e99ffd04f79aadadebcd696002d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-02 19:00:38 +00:00
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
T.J. Mercier
8972ce18d2 libprocessgroup: Remove ramdisk_available from libcgrouprc
...which no longer appears to be required.

Bug: 349105928
Change-Id: I0586f76147d9519ef6a520a10164e1b0f5e5c9b8
2024-12-02 17:41:12 +00:00
T.J. Mercier
62f8723f67 libprocessgroup: Remove vendor_ramdisk_available from libcgrouprc
...which no longer appears to be required.

Bug: 349105928
Change-Id: I9fc71f9cf3238dcc935da63ce1a3b0b69d9cccc1
2024-12-02 17:41:12 +00:00
T.J. Mercier
f26b13aeb1 libprocessgroup: Remove recovery_available from libcgrouprc
...which no longer appears to be required.

Bug: 349105928
Change-Id: I0ad1f44912fdaf98c05b60402c0166c535155775
2024-12-02 17:41:12 +00:00
Treehugger Robot
ee4959334f Merge "Update comments to point to the new location of event.logtags." into main am: e7a16c3aa0 am: 7aa226893f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376093

Change-Id: If6c74d92602e1b244a061fa2ef87f3ee421c0bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-02 15:35:55 +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
e948872d49 Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: db80953238 am: f716e1e0ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376683

Change-Id: Idd94bdbba9e2a76839eccc04efae32b6fc5aafe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 16:16:44 +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
91381408af Merge "Move Trusty C++ KeyMint to v4" into main am: bc6efddf79 am: e59a7fb20c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3375712

Change-Id: Ibcd3a7b635c90967159fe7fff62f7f42ebb75a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 08:41:18 +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
10db67cc52 Merge "libutils OWNERS for shayba@" into main am: 17cd008055 am: 2809871edc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3378962

Change-Id: Ied8f071eba57e7906640ecc9a1164b5ada867e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 01:45:59 +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
8e6b3d1328 Merge "libprefetch: rename property name" into main am: 7c066103a3 am: 3b4612e7da
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376861

Change-Id: I1d02d85727dd3a9234df4317605c545dbc8f2996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-26 09:24:27 +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
2d6b35749b Merge "Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into android15-tests-dev am: a8537415c1" into main am: f7b584086c am: f6ad6dc896
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365128

Change-Id: I7d4bf5262e17ca0725cd379fad4f9c8b0de8346e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 23:23:01 +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
Daniel Zheng
0892c015ab Merge "use V4 Health HAL" into main 2024-11-25 19:13:03 +00:00
Dennis Shen
b42bd9dd35 Merge "move aconfigd platform init service from init.rc into aconfigd.rc" into main am: c532409c5c am: 0f3c97ac6a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3344222

Change-Id: Ia0b177f0d760a372959ba6699757526ddd66d6ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 18:33:17 +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
ecc802e403 Merge "Remove /data/apex/hashtree directory" into main am: 1de1f1d83b am: f581beabbd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3374869

Change-Id: Ifb16a99f429ce0d03f991425cd0fcb8d04e917ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-25 11:27:16 +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
a13123fc59 Merge "libprefetch: Start prefetch service based on build" into main am: 3ffdc6206a am: 36252ab703
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3368783

Change-Id: I91d8cfc9ee0a073d547e2faeedd1b835d320abf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-23 07:34:56 +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
20d2c3db61 Merge "Remove |ro.hardware.| prefix in KM VM sys property" into main am: e3db20857f am: 33053b6f1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3365402

Change-Id: I9df4f6fd231a26bef9008782f4a729ca2c02ea19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-23 01:25:52 +00: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