Commit graph

88936 commits

Author SHA1 Message Date
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&regressionId=manual-dcf4b8bc69179f9a6bc4ce097a552d84-1712255116&testResultId=TR13229242143019813&invocationId=I86200010262612788

Change-Id: I2627a0c5f5b8d9a19b6a43f678facc64ffa6c189
2024-04-04 19:19:04 +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
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
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
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
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
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
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
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
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
Treehugger Robot
5f37162ee5 Merge "Add libEGL, libGLESv2 into provideLibs" into main am: 42fe7733a6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3019029

Change-Id: I4d44c6b7a03ee84d56cc83b50e07e4a423fac742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 05:37:30 +00:00
Treehugger Robot
42fe7733a6 Merge "Add libEGL, libGLESv2 into provideLibs" into main 2024-04-02 05:22:42 +00:00
Charisee
0f42bd4a83 Update needed for Rust v1.77.0
error: field `0` is never read
  --> system/core/trusty/keymint/src/keymint_hal_main.rs:40:24
   |
40 | struct HalServiceError(String);
   |        --------------- ^^^^^^
   |        |
   |        field in this struct
   |
   = note: `HalServiceError` has derived impls for the traits `Clone` and `Debug`, but these are intentionally ignored during dead code analysis
   = note: `-D dead-code` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(dead_code)]`
help: consider changing the field to be of unit type to suppress this warning while preserving the field numbering, or remove the field
   |
40 | struct HalServiceError(());
   |                        ~~


Bug: http://b/330185853
Test: ./test_compiler.py --prebuilt-path dist/rust-dev.tar.xz  --target aosp_cf_x86_64_phone --image

Change-Id: I79fb9019ba00900508aead414de80edd51f3fa2e
2024-04-02 04:53:01 +00:00
Jeongik Cha
91d82fb635 Add libEGL, libGLESv2 into provideLibs
which are dlopen'ed from librutabaga_gfx from com.android.virt

Bug: 325929966
Test: check if crosvm display works
Change-Id: I7245286ed646dc3287ad3c4df6e7c021b1dd439e
2024-04-02 12:53:26 +09:00
Treehugger Robot
7051ef6176 Merge "adb: Do not use fs_config unless we are root (try 3)." into main am: 94ec1a28a5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3021332

Change-Id: I2eb6269f7dc432a582eaca80c2ee27aed6ef7cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 00:02:05 +00:00
Treehugger Robot
94ec1a28a5 Merge "adb: Do not use fs_config unless we are root (try 3)." into main 2024-04-01 23:44:38 +00:00
Peter Collingbourne
4a57c8f4f2 adb: Do not use fs_config unless we are root (try 3).
This enables fs_config for /data when pushing files as root. Also,
without this, adb push to /tmp fails as the shell user.

When pushing to a directory that does not have an explicit
fs_config, such as /data/local/tmp or /tmp, use the original
file mode. Because adb copies u permissions into g and o
(and in general because the umask on the host may have
made these files world writable), this requires adding more
fs_config entries to cover directories that may contain dex files
i.e. /{odm,product,system,system_ext,vendor}/{framework,app,priv-app}
to avoid hitting a SecurityException caused by writable dex files, e.g.

04-01 21:22:16.980 10110  4815  4815 E AndroidRuntime: FATAL EXCEPTION: main
04-01 21:22:16.980 10110  4815  4815 E AndroidRuntime: Process: android.test.app.system_priv, PID: 4815
04-01 21:22:16.980 10110  4815  4815 E AndroidRuntime: java.lang.SecurityException: Writable dex file '/system/priv-app/loadlibrarytest_system_priv_app/loadlibrarytest_system_priv_app.apk' is not allowed.
04-01 21:22:16.980 10110  4815  4815 E AndroidRuntime:  at dalvik.system.DexFile.openDexFileNative(Native Method)
04-01 21:22:16.980 10110  4815  4815 E AndroidRuntime:  at dalvik.system.DexFile.openDexFile(DexFile.java:406)

Bug: 171233429
Bug: 311263616
Change-Id: I18f70095c793d08a25ff59e1851f6dc7648ce4dc
2024-04-01 15:18:49 -07:00
Chris Göllner
997ccd3532 Merge "Revert "adb: Do not use fs_config unless we are root (try 2)."" into main am: 8054f5e223
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3018727

Change-Id: I0d1defd0703621f00b99683186c0d892aa3c3941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-01 14:11:04 +00:00
Chris Göllner
8054f5e223 Merge "Revert "adb: Do not use fs_config unless we are root (try 2)."" into main 2024-04-01 13:55:02 +00:00
Weilin Wu
e2fbaed97b Revert "adb: Do not use fs_config unless we are root (try 2)."
Revert submission 3001420-main-Ied805bc3912ea0b4e1691127b5032aef632f85fd

Reason for revert: DroidMonitor: Potential culprit for Bug 331999499 - 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:3001420-main-Ied805bc3912ea0b4e1691127b5032aef632f85fd

Change-Id: Ibe525a6fd6c01b1f58c67c086306607c4f4d20db
2024-04-01 06:16:36 +00:00
Treehugger Robot
1d277413ad Merge "adb: Do not use fs_config unless we are root (try 2)." into main am: aedc0d0b41
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3002416

Change-Id: I5b23048d8fca29b354bb1b02699b2942e96bc872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-30 00:02:56 +00:00
Treehugger Robot
aedc0d0b41 Merge "adb: Do not use fs_config unless we are root (try 2)." into main 2024-03-29 23:57:33 +00:00
Peter Collingbourne
0919e1bc00 adb: Do not use fs_config unless we are root (try 2).
This enables fs_config for /data when pushing files as root. Also,
without this, adb push to /tmp fails as the shell user.

When pushing to a directory that does not have an explicit fs_config,
such as /data/local/tmp or /tmp, use the original file mode.

Bug: 171233429
Bug: 311263616
Change-Id: Ied805bc3912ea0b4e1691127b5032aef632f85fd
2024-03-29 15:13:13 -07:00
Devin Moore
a5521b0d9f init_kill_services_test: don't always try to kill hwservicemanager
When HIDL is not supported, hwservicemanager will not be running and may
not even be installed on the device.

Ignore-AOSP-First: Disabling HIDL internally first. Will cherry-pick
these test CLs after.

Test: init_kill_services_test
Bug: 218588089
Change-Id: Iae41e35e4669dd62c99ab9f138fc419be2f5fa29
2024-03-29 16:12:53 +00:00
Akilesh Kailash
b2270a5ce3 Merge "init: Remove legacy virtual-ab support" into main am: cd4b579ef4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3019245

Change-Id: Ie3721305731fdb82070dc63746ed2045d916f2b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 01:35:45 +00:00
Akilesh Kailash
cd4b579ef4 Merge "init: Remove legacy virtual-ab support" into main 2024-03-29 01:03:58 +00:00
Christopher Ferris
feb778465f Merge "Enable weak functions properly." into main am: 283482bdd3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3017684

Change-Id: I654fa53a9d6a89abd5d42ca1d0d21edff63252d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-28 17:39:08 +00:00
Akilesh Kailash
ec799183c8 init: Remove legacy virtual-ab support
Bug: 304829384
Test: OTA on Pixel
Change-Id: I8463a1cc102379daa41fdade6820222a5e3bdd86
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-03-28 09:53:36 -07:00
Christopher Ferris
283482bdd3 Merge "Enable weak functions properly." into main 2024-03-28 16:42:02 +00:00
Treehugger Robot
d0bda788b7 Merge "Remove unused VNDK-related function" into main am: 0c2ae80025
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3016418

Change-Id: I26ba89abf7959afd3dd079dd8431b87b7d8d2159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-28 04:31:14 +00:00
Treehugger Robot
0c2ae80025 Merge "Remove unused VNDK-related function" into main 2024-03-28 04:12:29 +00:00
Akilesh Kailash
164609e8f5 Merge "libsnapshot: don't kill the daemon for legacy vab snapshots" into main am: f56c861eac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3016837

Change-Id: Id0c96f3c4fb3ade0282ed5b3b3d71ba6630b4989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-28 02:50:57 +00:00
Akilesh Kailash
f56c861eac Merge "libsnapshot: don't kill the daemon for legacy vab snapshots" into main 2024-03-28 02:36:16 +00:00
Kiyoung Kim
37c3ed70c0 Remove unused VNDK-related function
This change is to clean up VNDK-related code from build. The function
append_vndk_version is not in use.

Bug: 330100430
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I691093aaedb7f6630cc32145dcaf7d36403bcf90
2024-03-28 11:19:03 +09:00
Christopher Ferris
bcaeacc686 Enable weak functions properly.
There is a check for WEAKS_AVAILABLE that is never set. Change this so
so it is available everywhere except apple/windows.

Add new test to verify that on Android the logStackInternal function is
defined.

Bug: 331489939

Test: All unit tests pass.
Change-Id: Ie982eba30ae421931a62718d39ff1f0c282453db
2024-03-27 17:49:51 -07:00