Nikita Ioffe
c079a6c34f
Merge "Restorecon /microdroid_resources in setup_selinux" into main
2024-04-08 11:20:39 +00:00
Raphaël Hérouart
20c3933ed4
Merge "lib/trusty: tipc-test should not print results to error stream" into main
2024-04-08 11:07:23 +00:00
Raphael Herouart
b238b90a79
lib/trusty: tipc-test should not print results to error stream
...
tipc-test results cannot be parsed in the CI because they output to
error stream
Bug: 314130383
Test: /data/nativetest64/vendor/tipc-test/tipc-test -t echo -r 1 -B 100
Change-Id: I2d6506fd69af06338041035526ca759884719c7b
2024-04-08 09:13:46 +00:00
Jiyong Park
7eab524c39
Merge "init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim" into main am: 78a7365ffc
am: cc055899f9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027805
Change-Id: I5e7c5eec7f2a7d81abec14ab59d710f87b73e61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-07 05:58:37 +00:00
Jiyong Park
cc055899f9
Merge "init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim" into main am: 78a7365ffc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027805
Change-Id: I4d064f97285a380e174b51cc81000f74d422c337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-07 05:43:50 +00:00
Jiyong Park
78a7365ffc
Merge "init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim" into main
2024-04-07 05:23:52 +00:00
Raphaël Hérouart
1e3b9bd3cd
Merge "lib/trusty: tipc-test suite name is incorrect in JSON output" into main am: ef2e67eec1
am: 633f4dba63
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027813
Change-Id: I687377e095da7fba74fbd3dc8862ac98364a7058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 15:35:21 +00:00
Raphaël Hérouart
633f4dba63
Merge "lib/trusty: tipc-test suite name is incorrect in JSON output" into main am: ef2e67eec1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027813
Change-Id: I1f094cae54ff7b59bc07fb862cbb081be2561a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 15:09:05 +00:00
Raphaël Hérouart
ef2e67eec1
Merge "lib/trusty: tipc-test suite name is incorrect in JSON output" into main
2024-04-05 14:56:22 +00:00
Raphael Herouart
4f3a4cbc5e
lib/trusty: tipc-test suite name is incorrect in JSON output
...
tipc-test suite should be tipc not crypto
Bug: 314130383
Test: /data/nativetest64/vendor/tipc-test/tipc-test -t echo -r 1 -B 100
Change-Id: Icc0921a032f8b784f4797f43b6180136777f422f
2024-04-05 11:50:42 +00:00
Shrinidhi Hegde
62593286d0
Merge "Revert "Update native watchdog to be triggered after 20 restarts instead of 4."" into main am: 09071c46d8
am: aa7b93fc37
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027767
Change-Id: I6c70e7f99f7dc5107d153f55878fc900041e6103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 00:53:46 +00:00
Shrinidhi Hegde
aa7b93fc37
Merge "Revert "Update native watchdog to be triggered after 20 restarts instead of 4."" into main am: 09071c46d8
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027767
Change-Id: Ief944e40996250ec044c8f952aceb38e141b03c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-05 00:41:41 +00:00
Shrinidhi Hegde
09071c46d8
Merge "Revert "Update native watchdog to be triggered after 20 restarts instead of 4."" into main
2024-04-05 00:23:45 +00:00
Shrinidhi Hegde
ae5ce6f7c3
Revert "Update native watchdog to be triggered after 20 restarts instead of 4."
...
This reverts commit 1d928ca80b
.
Reason for revert: Breaks Host side CTS test https://android-build.corp.google.com/test_investigate/?referrer=buganizer®ressionId=manual-dcf4b8bc69179f9a6bc4ce097a552d84-1712255116&testResultId=TR13229242143019813&invocationId=I86200010262612788
Change-Id: I2627a0c5f5b8d9a19b6a43f678facc64ffa6c189
2024-04-04 19:19:04 +00:00
Treehugger Robot
5268eb66c3
Merge "Fix typo in comment." into main am: f0a1a724c0
am: 4bd516ab17
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3025523
Change-Id: I4d19ca4f613bab4d03db80758c21ded05e3446b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 19:14:06 +00:00
Treehugger Robot
4bd516ab17
Merge "Fix typo in comment." into main am: f0a1a724c0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3025523
Change-Id: If7ea7b3ba6923a74afc869ee24890638efde556e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 18:54:37 +00:00
Treehugger Robot
f0a1a724c0
Merge "Fix typo in comment." into main
2024-04-04 18:29:34 +00:00
Treehugger Robot
2d2af46738
Merge changes I456aa53d,I286c6947 into main am: d334b826c9
am: 919cb8a294
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027803
Change-Id: I9f2a2069c6b193fe579650a42a82361f159ddeb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 17:54:13 +00:00
Treehugger Robot
919cb8a294
Merge changes I456aa53d,I286c6947 into main am: d334b826c9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3027803
Change-Id: I8333ad55fa890327948d84dcddee662a90b2b40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 17:30:52 +00:00
Treehugger Robot
d334b826c9
Merge changes I456aa53d,I286c6947 into main
...
* changes:
getevent: print error message when failing to get event
getevent: add Framework Input team as owners
2024-04-04 17:14:32 +00:00
Shrinidhi Hegde
055bd0ad17
Merge "Update native watchdog to be triggered after 20 restarts instead of 4." into main am: 9261e262cb
am: b7ce258da4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3018204
Change-Id: I6628a580c6b28021b6caa77fa113712d1177e045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 16:58:18 +00:00
Shrinidhi Hegde
b7ce258da4
Merge "Update native watchdog to be triggered after 20 restarts instead of 4." into main am: 9261e262cb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3018204
Change-Id: Iad5dd2bf96fbe2333198d9f8a81d4d98ce3dbd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 16:39:30 +00:00
Shrinidhi Hegde
9261e262cb
Merge "Update native watchdog to be triggered after 20 restarts instead of 4." into main
2024-04-04 16:25:43 +00:00
Michael Bestas
867f0ada9a
init: Remove encryption=DeleteIfNecessary from /data/misc/bootanim
...
/data/misc already sets encryption=Require and this causes certain
devices not being able to boot with the following error:
init: Failed to set encryption policy of /data/misc/bootanim to
a5a40d896b46d8c6 v1 modes 127/4 flags 0x0: The directory already
has a different encryption policy.
init: Setting a5a40d896b46d8c6 policy on /data/misc/bootanim failed!
init: Setting policy failed, deleting: /data/misc/bootanim
init: Failed to set encryption policy of /data/misc/bootanim to
a5a40d896b46d8c6 v1 modes 127/4 flags 0x0: The directory already
has a different encryption policy.
init: Setting a5a40d896b46d8c6 policy on /data/misc/bootanim failed!
init: Rebooting into recovery
init: Got shutdown_command 'reboot,recovery' Calling
HandlePowerctlMessage()
Test: m; fastboot flashall, observe device boots successfully
Change-Id: I86a2b2b8fe8e438ca405a0e901739d11550d3ebd
2024-04-04 19:11:21 +03:00
Harry Cutts
08686936b5
getevent: print error message when failing to get event
...
For some reason we weren't saying what the error was here, which could
be useful. Also change the failure message slightly to distinguish
between failing to get inotify and evdev events.
Bug: 245989146
Test: m toolbox
Change-Id: I456aa53d008043ea2549024002f9b88ea8d2d2cf
2024-04-04 15:14:26 +00:00
Harry Cutts
b8f9475fd7
getevent: add Framework Input team as owners
...
Bug: 245989146
Test: Treehugger
Change-Id: I286c6947e59013afe816b949b51f081bbfe5924e
2024-04-04 15:14:26 +00:00
Jiyong Park
2f8efe00af
skip nop persistent property writes
...
Bug: 332611029
Test: TH
Change-Id: I0f6ca09c781964d1eb432a770c50e7216f043b4f
2024-04-04 22:15:18 +09:00
Nikita Ioffe
feb7e0ea97
Restorecon /microdroid_resources in setup_selinux
...
The main reason for running restorecon of /microdroid_resources during
the setup_selinux stage is to avoid granting init some weird permissions
like `allow init tmpfs:file relabelfrom;`.
Instead we add such permissions to kernel domain in which setup_selinux
runs. This feels better since kernel domain already has similar
permissions like `allow kernel rootfs:file relabelfrom;`.
Bug: 287593065
Test: run microdroid vm with vendor partition
Change-Id: I82ef5499392e90f53655f7582e887d0b6cb3a5f0
2024-04-04 13:04:52 +00:00
Elliott Hughes
c57d31db19
Merge "linker.config.json: remove libpac.so." into main am: bf33268695
am: da549de1d5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3022723
Change-Id: Ife9ae8e317b061ffba9c9e42f39b5df8ab6d1e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 01:39:54 +00:00
Elliott Hughes
da549de1d5
Merge "linker.config.json: remove libpac.so." into main am: bf33268695
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3022723
Change-Id: I029f5f43668a80dc1ccfa70aad4ef4906ee8a170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-04 01:22:25 +00:00
Elliott Hughes
bf33268695
Merge "linker.config.json: remove libpac.so." into main
2024-04-04 00:34:29 +00:00
Treehugger Robot
870059f18f
Merge "Add dm-thin support" into main am: a45e51339d
am: 5e461d5870
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3016369
Change-Id: I2df2091f3be2fb02bf8d5f84508daed07a2c178c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 22:18:16 +00:00
Treehugger Robot
5e461d5870
Merge "Add dm-thin support" into main am: a45e51339d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3016369
Change-Id: I749439886983c1e87a9baebd5b5d040df75469bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 22:02:14 +00:00
Treehugger Robot
a45e51339d
Merge "Add dm-thin support" into main
2024-04-03 21:46:00 +00:00
Elliott Hughes
dbb87ec8a7
Fix typo in comment.
...
Change-Id: I1d7e061cf7578d88987d16aa1684d94967af09f7
2024-04-03 16:44:22 +00:00
Shrinidhi Hegde
1d928ca80b
Update native watchdog to be triggered after 20 restarts instead of 4.
...
The native watchdog performs a complete reboot on 5 system server
restarts even before packageWatchdog/RescueParty can perform any of the
mitigations. Increasing the thrsehold at which native watchdog kicks in
to 20 instad of 4.
Test: manual
Bug: 291137901
Change-Id: I9166f6555020e8bf26cc86994b13c53745a9934b
2024-04-03 13:02:12 +00:00
Jooyung Han
2f814176ea
Add dm-thin support
...
thin-pool and thin targets are supported via DmTargetThinPool and
DmTargetThin. DM_TARGET_MSG is also added via a new method
SendMessage() because it's used to create a thin volumn.
dmctl is extended to support thin-pool and thin targets.
TODO: thin-pool target constructor can accept feature arguments.
Bug: 327081431
Test: atest libdm_test (CF with dm-thin enabled kernel)
Change-Id: I4c51c668bfe1489b959f6d03c205a5e2e63d9a1d
2024-04-03 10:47:47 +09:00
Charisee Chiw
b3eef745aa
Merge "Update needed for Rust v1.77.0" into main am: 62963d97c4
am: 9669bd1654
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3021338
Change-Id: I6b91308dfddc18e009ab568e735189ad711a296a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 21:40:28 +00:00
Charisee Chiw
9669bd1654
Merge "Update needed for Rust v1.77.0" into main am: 62963d97c4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3021338
Change-Id: I2116dca11a7ff217bc65a162efdb685cf69baf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 21:08:27 +00:00
Charisee Chiw
62963d97c4
Merge "Update needed for Rust v1.77.0" into main
2024-04-02 20:55:26 +00:00
Treehugger Robot
90a6f7d708
Merge "snapshotctl: Build few commands only for userdebug/eng builds" into main am: 2dab9f2968
am: 63d2f5e3ed
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2983105
Change-Id: I5da2a15206be8f9d0a43069df529ef59936ee95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 18:14:24 +00:00
Treehugger Robot
63d2f5e3ed
Merge "snapshotctl: Build few commands only for userdebug/eng builds" into main am: 2dab9f2968
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2983105
Change-Id: Ic4bca6d572b5a260c87e6efec7b9534ba144daf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 17:57:13 +00:00
Treehugger Robot
2dab9f2968
Merge "snapshotctl: Build few commands only for userdebug/eng builds" into main
2024-04-02 17:39:16 +00:00
Devin Moore
36c2f1d077
Merge "init_kill_services_test: don't always try to kill hwservicemanager" into main am: bc4f870aaa
am: 3e717ac586
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3020263
Change-Id: If15c693c36aa8f96eef7818fbaeea771cf1dd99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:58:10 +00:00
Devin Moore
3e717ac586
Merge "init_kill_services_test: don't always try to kill hwservicemanager" into main am: bc4f870aaa
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3020263
Change-Id: I282aa145c09056693cee4bf6782b5da46513f386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 16:47:50 +00:00
Devin Moore
bc4f870aaa
Merge "init_kill_services_test: don't always try to kill hwservicemanager" into main
2024-04-02 16:37:00 +00:00
Elliott Hughes
d4bd799fcc
linker.config.json: remove libpac.so.
...
The bug in the TODO was fixed 5 years ago, so this should be
obsolete?
Change-Id: I636adccb9852170a00ea171dd96e2f176bf70489
2024-04-02 14:19:15 +00:00
Satish Yalla
133b0415f2
Merge "Revert "init_kill_services_test: don't always try to kill hwserv..."" into main
2024-04-02 10:45:18 +00:00
Satish Yalla
916ed66659
Revert "init_kill_services_test: don't always try to kill hwserv..."
...
Revert submission 26722372-nomo_hidl
Reason for revert: <Reason for revert: Potential culprit for b/332395670- 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:26722372-nomo_hidl
Change-Id: I6fe936e3c27f528020b36def91c541f37e638b98
2024-04-02 06:46:21 +00:00
Treehugger Robot
aaf1dc8b32
Merge "Add libEGL, libGLESv2 into provideLibs" into main am: 42fe7733a6
am: 5f37162ee5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3019029
Change-Id: Iba892d56fcd920045b9f86d05051907bf9f7377f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 05:53:56 +00:00