tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
84678 commits 1 branch 0 tags 215 MiB
Commit graph

84678 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Drysdale
fdd94daa59 Merge "KeyMint HAL: process destroyAttestationIds" into main am: 2f6bd6fa43 am: 2d04aaf068 am: bc97084e02 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700896

Change-Id: I28a6dcf7ba73bc750be0200a16d405fd91a3949c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 11:41:23 +00:00
David Drysdale
bc97084e02 Merge "KeyMint HAL: process destroyAttestationIds" into main am: 2f6bd6fa43 am: 2d04aaf068 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700896

Change-Id: Ia82790af1037cbc0b447bf9542e6274a9fe4817f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 10:53:45 +00:00
David Drysdale
2d04aaf068 Merge "KeyMint HAL: process destroyAttestationIds" into main am: 2f6bd6fa43 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700896

Change-Id: Ibc14dd77cf1779ccec9d0307118cc158de90c059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 10:09:48 +00:00
David Drysdale
2f6bd6fa43 Merge "KeyMint HAL: process destroyAttestationIds" into main 2023-08-11 09:26:12 +00:00
Treehugger Robot
4a072e07c5 Merge changes from topic "read-bootstrap-apex" into main am: 236dbc30fc am: 35f325002c am: 67df2ad230 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702894

Change-Id: I6c9e933098f4b16b7b6f0cf876cc395bc6b814e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 06:48:00 +00:00
Treehugger Robot
67df2ad230 Merge changes from topic "read-bootstrap-apex" into main am: 236dbc30fc am: 35f325002c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702894

Change-Id: If6a4bb761be7d048143a1d3dae1a4a1e307e30d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 06:01:27 +00:00
Treehugger Robot
35f325002c Merge changes from topic "read-bootstrap-apex" into main am: 236dbc30fc 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702894

Change-Id: Idfcc5e774412109fbfc02f0eb5d1327541238bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 05:18:46 +00:00
Jooyung Han
2982f09d57 Dedup apex-scanning 
create_apex_data_dirs() now uses GetApexListFrom(dir) in
apex_init_util.cpp.

This is essentially a refactoring, but there are a few behavioral
changes, which I think make more sense.
- Emits no error when opendir(/apex) fails.
- Emits errors when mkdir fails for each apex.
- Does not abort `perform_apex_config` even though create_apex_data_dirs
  fails.

Bug: 293546778
Test: check /data/misc/apexdata/ after boot
Change-Id: I9d1a9710a6a626eec087c8c0fb1768667ffb036e
 2023-08-11 14:14:37 +09:00
Treehugger Robot
236dbc30fc Merge changes from topic "read-bootstrap-apex" into main 
* changes:
  Skip bootstrap APEX RC files for the second round
  Read .rc files from bootstrap apexes
 2023-08-11 04:48:28 +00:00
Wei Li
d8a270698d Track root directory symlinks created by LOCAL_POST_INSTALL_CMD in 
ALL_ROOTDIR_SYMLINKS and add them to ALL_DEFAULT_INSTALLED_MODULES,
so they can be included in product SBOMs properly.

Bug: 272358980
Test: CIs and build/soong/tests/sbom_test.sh
Change-Id: I73dfb34156d681786c013912e59a0d0c0c48ecc7
 2023-08-10 18:18:36 -07:00
Jooyung Han
55ef3d6104 Skip bootstrap APEX RC files for the second round 
Reading .rc files from bootstrap APEXes causes "double loading".
This works for services because init just ignores duplicates. But it
emits error logs, which can mislead even though there's no actual
errors. Besides, for actions, duplicates can cause a problem when
commands are not idempotent.

So, when loading RC files from APEXes for the second time, we'd better
skip those bootstrap APEXes.

Bug: 290148081
Test: VendorApexHostTestCases
Change-Id: Ia630dbd14046064b5e5c612c01ebacf57091c8d4
 2023-08-11 10:02:08 +09:00
Christopher Ferris
f16257c288 Merge "Fix potential miscellaneous debuggerd issues." into main am: 9f32fba6d3 am: ffd2acb324 am: 8d590cfa7b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681535

Change-Id: If3665dbfb8e42f698f393be3c86c6f3e5f2f0b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 22:35:21 +00:00
Christopher Ferris
8d590cfa7b Merge "Fix potential miscellaneous debuggerd issues." into main am: 9f32fba6d3 am: ffd2acb324 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681535

Change-Id: I8a968bf585b27a432ec5f36a69e94afd0a298d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 21:46:47 +00:00
Christopher Ferris
ffd2acb324 Merge "Fix potential miscellaneous debuggerd issues." into main am: 9f32fba6d3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681535

Change-Id: I945ed8fa2539d5992926f4da1a2c55986c5b422c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 20:38:57 +00:00
Treehugger Robot
237d5888a7 Merge "libsnapshot: Check for valid snapshots based on current slot" into main am: acdc4848e0 am: 8ef208f7a1 am: fccfcec283 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701654

Change-Id: I423050f5b64cbdbb4675f45b5ee163ea5627243c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 20:16:35 +00:00
Christopher Ferris
9f32fba6d3 Merge "Fix potential miscellaneous debuggerd issues." into main 2023-08-10 19:53:19 +00:00
Treehugger Robot
fccfcec283 Merge "libsnapshot: Check for valid snapshots based on current slot" into main am: acdc4848e0 am: 8ef208f7a1 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701654

Change-Id: I3f533586ea082a798d3b8335abb391d397a2df1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 19:07:36 +00:00
Treehugger Robot
8ef208f7a1 Merge "libsnapshot: Check for valid snapshots based on current slot" into main am: acdc4848e0 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701654

Change-Id: Ia9abf433765b28a9f590f01c2fbf3d1be9f3a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 18:21:10 +00:00
Treehugger Robot
acdc4848e0 Merge "libsnapshot: Check for valid snapshots based on current slot" into main 2023-08-10 17:29:46 +00:00
Akilesh Kailash
3983f9aa6e libsnapshot: Check for valid snapshots based on current slot 
We may have snapshot files in /metadata/ota/snapshot/ which ends with
.tmp such as system_a.tmp - This happens if the device
reboots just before `rename` in `WriteStringToFileAtomic`. This
can lead to spurious merge failures.

Log the error and skip these snapshot files. It is ok to skip
as we will still have original snapshot status files since
we are already in the merge path. Additionally, try to remove
these files when snapshot is deleted.

Bug: 292198189
Test: OTA
Change-Id: I5db3dbd5a919b263ae577185de3e7f79a5e9b89a
Signed-off-by: Akilesh Kailash <akailash@google.com>
 2023-08-10 09:36:35 -07:00
Tomasz Wasilczyk
d3550e3314 Remove cutils threads.h header completely. 
Bug: 289414897
Test: it builds
Change-Id: Ifcde5849923f19f1c898a6a95811eea55be0d276
 2023-08-10 15:12:05 +00:00
Po-yao Chang
6fe9367f7b Run boringssl tests according to ro.zygote 
If ro.zygote is zygote64, don't bother running 32-bit test.
Otherwise abilist{32,64} decides what tests to run.

Bug: 291874369
Test: make gsi_arm64-user; Check /system/etc/init/hw
Change-Id: Id10b2242606d6400acc29c3174f713581d6cce2e
 2023-08-10 17:12:47 +08:00
Jooyung Han
5c4217cf6e Read .rc files from bootstrap apexes 
To start an early_hal service from a bootstrap vendor apex, init now
reads .rc files from bootstrap apexes as well.

In this change, perform_apex_config command is re-purposed to support
bootstrap mode. Now we have some similarity between two apexd calls:

- for bootstrap apexes (in the bootstrap mount namespace):

  exec_start apexd-bootstrap
  perform_apex_config --bootstrap

- for normal apexes (in the default mount namespace):

  restart apexd
  ...
  wait_for_prop apexd.status activated
  perform_apex_config

Note that some tasks in perform_apex_config are not needed in the
bootstrap.  For example, we don't need to create apexdata directories
for bootstrap apexes.

Bug: 290148081
Test: VendorApexHostTestCases
Change-Id: I8f683a4dcd7cd9a2466a4b1b417d84c025c37761
 2023-08-10 15:40:06 +09:00
Treehugger Robot
b913610139 Merge "Remove gettid symbol from cutils" into main am: 0c0dafae8d am: 26af0ec2d7 am: 6e543b0ed9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681176

Change-Id: Ibd1dfc969e7890d68d7e3c659f79426a20deaa00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 06:32:03 +00:00
Treehugger Robot
6e543b0ed9 Merge "Remove gettid symbol from cutils" into main am: 0c0dafae8d am: 26af0ec2d7 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681176

Change-Id: I042ec24af1c1e6aa4f3500a9e0815a721da80013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 05:47:26 +00:00
Treehugger Robot
26af0ec2d7 Merge "Remove gettid symbol from cutils" into main am: 0c0dafae8d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681176

Change-Id: I4c44ab32cf585e89e06a2d343317a721cf0a63de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 05:01:51 +00:00
Jooyung Han
10f274258c Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 370ee1bbda am: ef8229fb0b am: 468238cf48 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700774

Change-Id: I9c45665424ee79519f680c219d8c5cd6f0e42c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 04:41:17 +00:00
Treehugger Robot
0c0dafae8d Merge "Remove gettid symbol from cutils" into main 2023-08-10 04:13:24 +00:00
Jooyung Han
468238cf48 Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 370ee1bbda am: ef8229fb0b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700774

Change-Id: I7f08e863762e313450719020b161a6b60dcf383d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 03:57:53 +00:00
Jooyung Han
ef8229fb0b Merge "Use /bootstrap-apex for bootstrap APEXes" into main am: 370ee1bbda 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700774

Change-Id: I98404432e5d8a6d355388728200133e84a469ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 03:11:15 +00:00
Jooyung Han
370ee1bbda Merge "Use /bootstrap-apex for bootstrap APEXes" into main 2023-08-10 02:38:30 +00:00
Treehugger Robot
8ca4c6b227 Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main am: cf32fd18d4 am: 611837f4f3 am: 8072480b4f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701913

Change-Id: I8504135cd983167eeff604ec6e3fcc3c42bcd196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 01:14:11 +00:00
Christopher Ferris
3a0833c9cd Fix potential miscellaneous debuggerd issues. 
Check for the log opening failing.

Add the ability to put error messages in the log and tombstone so
that it's clear if the log reading failed in some way.

Adjust test so that if there is a log or if no log exists, the test
will still pass.

Print an <unknown> if the command line is unreadable instead of nothing.

Test: Ran unit tests.
Test: Induced error and verified error message is save in tombstone.
Change-Id: I2fce8078573b40b9fed3cd453235f3824cadb5e3
 2023-08-09 17:31:55 -07:00
Treehugger Robot
8072480b4f Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main am: cf32fd18d4 am: 611837f4f3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701913

Change-Id: Ib688d90912b77a70d7a8709251a60f148f04f5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 00:31:52 +00:00
Treehugger Robot
611837f4f3 Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main am: cf32fd18d4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701913

Change-Id: Ieb0fb13cc1a8519497595dc24517bd9ca5adbaff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 23:46:19 +00:00
Treehugger Robot
cf32fd18d4 Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main 2023-08-09 23:15:06 +00:00
Tomislav Novak
24a7df5d38 debuggerd: fix passing of fdsan_table to crash_dump 
Commit aosp/1259140 moved fdsan_table into debugger_process_info, which
is populated conditionally. This introduced a bug where the process that
receives BIONIC_SIGNAL_DEBUGGER (35) does not propagate the fdsan_table
pointer to crash_dump:

  $ adb shell kill -SIG35 <pid>
  $ adb logcat -s DEBUG
  E DEBUG   : failed to read fdsan table entry 0: I/O error

Fdsan in warn-only mode uses BIONIC_SIGNAL_DEBUGGER[1], so the generated
tombstones don't have any fd ownership info.

Fix it by calling get_process_info() irrespective of the signal being
handled, taking care to preserve the previous behavior of not showing
abort messages set by applications in non-fatal dumps.

Test: debuggerd_test
Test: send SIG35 to arbitrary process and inspect the log and tombstone
Test: crasher fdsan_file

[1] 20ad9129e7/libc/bionic/fdsan.cpp (166)

Change-Id: I76931ca4825e846fc99f26fa590c045130abb850
 2023-08-09 15:19:51 -07:00
Keith Mok
a8d9426096 Merge "Adding force_flash functionality" into main am: eb2165079a am: c5e5e488b8 am: 27e7f6d601 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700958

Change-Id: I58dd24f0f5a8ff747bae949910d28bb6da06d096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:56:29 +00:00
Daniel Zheng
312ccc02f4 Merge "decompressor maintenence" into main am: 86f037c245 am: 76a163f279 am: 9c2e66ee5a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453

Change-Id: Iafd85c9123b959b7eef2048331f2fb8a447ab120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:56:07 +00:00
Daniel Zheng
253944ff65 Merge "Moving includes" into main am: dc3c5292c7 am: 0789550612 am: fb1e0e7f9f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697600

Change-Id: I15b2ae126ac6b0b0a0435ecb0e739d26a70b3b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:55:56 +00:00
Daniel Zheng
c850fcc7b6 Merge "libsnapshot: take in compression_level" into main am: 73846d68cf am: 50cc4a61c4 am: 5580fe71f5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692962

Change-Id: If5c78e42d1e4274c3bb7c3cbd3741f50a6e90c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:55:03 +00:00
Keith Mok
27e7f6d601 Merge "Adding force_flash functionality" into main am: eb2165079a am: c5e5e488b8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700958

Change-Id: I15d01e0bc2e95761f21a38107a17e104e9be02aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:13:55 +00:00
Daniel Zheng
9c2e66ee5a Merge "decompressor maintenence" into main am: 86f037c245 am: 76a163f279 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453

Change-Id: I6c4eff9bfa53b2e88f308f3a5b0a108d297748ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:13:44 +00:00
Daniel Zheng
fb1e0e7f9f Merge "Moving includes" into main am: dc3c5292c7 am: 0789550612 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697600

Change-Id: I28a0d387a22defd2847a8def71f5c1379249f375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:13:32 +00:00
Daniel Zheng
5580fe71f5 Merge "libsnapshot: take in compression_level" into main am: 73846d68cf am: 50cc4a61c4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692962

Change-Id: Ie6cb6bc76337c2568357a290f64e0d23f9fb25cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 21:13:06 +00:00
Keith Mok
c5e5e488b8 Merge "Adding force_flash functionality" into main am: eb2165079a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700958

Change-Id: I1835f087e3724654806c0ac0cbe6ee6d005177dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 20:51:43 +00:00
Daniel Zheng
76a163f279 Merge "decompressor maintenence" into main am: 86f037c245 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453

Change-Id: Id59be4eb265d33cf66ea756031e2b50eddd99ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 20:50:58 +00:00
Daniel Zheng
0789550612 Merge "Moving includes" into main am: dc3c5292c7 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2697600

Change-Id: I8dcb1f2f357fb9c708abb64e799e72d20e2dfc66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 20:49:40 +00:00
Keith Mok
eb2165079a Merge "Adding force_flash functionality" into main 2023-08-09 20:45:24 +00:00
Daniel Zheng
50cc4a61c4 Merge "libsnapshot: take in compression_level" into main am: 73846d68cf 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692962

Change-Id: I9fe1f805dd5c380a5f647a5ed2e2e632cf6a0f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 20:28:16 +00:00