ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
64422 commits 1 branch 0 tags 217 MiB
Commit graph

64422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jooyung Han
b58fa0646b Merge "ueventd: change firmware location in apexes" am: fb2dafa538 am: 25dea8c25f am: 829aec970a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429931

Change-Id: Ifa8d6672d6b87212d8d48373e510b803dee828ea
 2020-09-22 03:01:20 +00:00
Treehugger Robot
209bd16270 Merge "logd: additional logging if read_offset > buffer_it->write_offset()" am: 55d3e1f9b9 am: 27b3ddc2ea am: ac893b2674 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1433571

Change-Id: I50b19d7e17bbefec216766751f3c516c6894bf41
 2020-09-22 03:01:05 +00:00
Jooyung Han
829aec970a Merge "ueventd: change firmware location in apexes" am: fb2dafa538 am: 25dea8c25f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429931

Change-Id: I6fdfa020076d472f03762ae8beb29b1439f3b88c
 2020-09-22 02:26:29 +00:00
Treehugger Robot
ac893b2674 Merge "logd: additional logging if read_offset > buffer_it->write_offset()" am: 55d3e1f9b9 am: 27b3ddc2ea 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1433571

Change-Id: If225ce7d9bda8ff1b790c11b6ff1de9ac1752d24
 2020-09-22 02:25:59 +00:00
Jooyung Han
25dea8c25f Merge "ueventd: change firmware location in apexes" am: fb2dafa538 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429931

Change-Id: I0e399c78f3ac26808703623dc902b9da3dbc8d51
 2020-09-22 01:55:23 +00:00
Treehugger Robot
27b3ddc2ea Merge "logd: additional logging if read_offset > buffer_it->write_offset()" am: 55d3e1f9b9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1433571

Change-Id: I0370d07bf013f15e04e2444f2887ea3596311a5d
 2020-09-22 01:51:27 +00:00
Jooyung Han
fb2dafa538 Merge "ueventd: change firmware location in apexes" 2020-09-22 01:36:35 +00:00
Treehugger Robot
55d3e1f9b9 Merge "logd: additional logging if read_offset > buffer_it->write_offset()" 2020-09-22 01:14:15 +00:00
Tom Cherry
5d1fbece58 logd: additional logging if read_offset > buffer_it->write_offset() 
I didn't expect this to ever be hit, but apparently it is, so add
additional logging to track it down.

Bug: 168870781
Test: build
Change-Id: Ia472bc7458a3727e4d407365672f7394426ae515
 2020-09-21 15:10:20 -07:00
Tom Cherry
009660b5b4 Merge "logd: remove min heap in SerializedFlushToState" am: b92ac53aeb am: eb2b5408b6 am: 0a01b6da1b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431987

Change-Id: Ic5a1f173bcae1248cb71bd7e7510277339022895
 2020-09-21 19:05:04 +00:00
David Anderson
ae74bc43b0 Merge "libsnapshot: Prototype the new API for mapping writable snapshots." am: 32771b2aa3 am: 4d620fc341 am: 62b3360567 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430217

Change-Id: Ib23860720fcc7ecbcad6a4e8cf7d48399f46dc1d
 2020-09-21 19:04:52 +00:00
Tom Cherry
0a01b6da1b Merge "logd: remove min heap in SerializedFlushToState" am: b92ac53aeb am: eb2b5408b6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431987

Change-Id: I3440dde8a013ffac4db424be5e7dd27eca494cbe
 2020-09-21 18:42:08 +00:00
David Anderson
62b3360567 Merge "libsnapshot: Prototype the new API for mapping writable snapshots." am: 32771b2aa3 am: 4d620fc341 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430217

Change-Id: Ie1ddb6b1ef3805089e84d4179499305ba90b1aac
 2020-09-21 18:41:55 +00:00
Tom Cherry
eb2b5408b6 Merge "logd: remove min heap in SerializedFlushToState" am: b92ac53aeb 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431987

Change-Id: I599fecb6e1f797bfa5409e3b767f6c0a14766cb9
 2020-09-21 18:24:18 +00:00
David Anderson
4d620fc341 Merge "libsnapshot: Prototype the new API for mapping writable snapshots." am: 32771b2aa3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430217

Change-Id: Ic96666a7c2e1cf7840b7f7bd778cce13327a56b8
 2020-09-21 18:19:07 +00:00
Tom Cherry
b92ac53aeb Merge "logd: remove min heap in SerializedFlushToState" 2020-09-21 18:10:43 +00:00
David Anderson
32771b2aa3 Merge "libsnapshot: Prototype the new API for mapping writable snapshots." 2020-09-21 17:56:08 +00:00
Jooyung Han
faafdd2fe9 Merge "fs_config: add bin paths of flattened apexes" am: 529ace17b6 am: 00fa8e7d5c am: e9b3d13722 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1432791

Change-Id: Ia5daf9e13b91528baeb35642e5014d1fceb03df6
 2020-09-21 16:54:21 +00:00
Tom Cherry
f5dad71dfa Merge "Use libcutils_headers for android_filesystem_config.h" am: 67e08784ed am: ec0ffbcff3 am: a330604594 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430209

Change-Id: Iaf07b40d69da3f69510fc853409bf7ed2e3d25cd
 2020-09-21 16:52:22 +00:00
Jooyung Han
e9b3d13722 Merge "fs_config: add bin paths of flattened apexes" am: 529ace17b6 am: 00fa8e7d5c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1432791

Change-Id: Ibf36805d5144cc9f8bf45a9e6ea7afeca1192645
 2020-09-21 16:22:03 +00:00
Tom Cherry
a330604594 Merge "Use libcutils_headers for android_filesystem_config.h" am: 67e08784ed am: ec0ffbcff3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430209

Change-Id: I282c95d88f9ccc946055efd7728fc75e8723dcae
 2020-09-21 16:21:50 +00:00
Jooyung Han
00fa8e7d5c Merge "fs_config: add bin paths of flattened apexes" am: 529ace17b6 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1432791

Change-Id: Ibf3fa90572503c4a8d3054d09c37648bd9c4075d
 2020-09-21 15:52:10 +00:00
Tom Cherry
ec0ffbcff3 Merge "Use libcutils_headers for android_filesystem_config.h" am: 67e08784ed 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430209

Change-Id: I361e212e084ea073c5eca6b3e1abc09a42004d8a
 2020-09-21 15:51:52 +00:00
Jooyung Han
529ace17b6 Merge "fs_config: add bin paths of flattened apexes" 2020-09-21 15:47:59 +00:00
Tom Cherry
67e08784ed Merge "Use libcutils_headers for android_filesystem_config.h" 2020-09-21 15:29:41 +00:00
Jooyung Han
a70cea57a9 fs_config: add bin paths of flattened apexes 
Added missing partitions (/product and /vendor).

APEXes can be put in /system, /system_ext, /product, and /vendor.
Binaries within "flattened" apexes should be marked as executable.

Bug: 167383491
Bug: 169025459
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m vendorimage with a vendor apex
      simg2img $OUT/vendor.img vendor.img
      debugfs -R 'ls -l /vendor/apex/com.android.foo/bin' vendor.img
      => check if binaries are executable
Change-Id: I67284166d70c98a2a184b47e7052ade8b9039df9
 2020-09-21 19:50:43 +09:00
Jooyung Han
2833e5d37d ueventd: change firmware location in apexes 
To be consistent with other prebuilt modules within APEXes, the location
for firmware files is switched from /apex/*/firmware to
/apex/*/etc/firmware.

Bug: 167942098
Test: loading vibrator firmware from vibrator apex(sunfish)
Change-Id: Ia05735bf5a54482fded26525fa4a8f795dcfc029
 2020-09-21 10:56:10 +09:00
Jooyung Han
c7b123050d Merge "ueventd: scans /apex/*/firmware for firmwares" am: 62ccfa0c61 am: ed8016598a am: d77ba4d7dd 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429856

Change-Id: I33fa7e43b03d76f2e2f37de936987b9017f151ed
 2020-09-20 00:10:04 +00:00
Jooyung Han
d77ba4d7dd Merge "ueventd: scans /apex/*/firmware for firmwares" am: 62ccfa0c61 am: ed8016598a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429856

Change-Id: I655a58d1ffdd5251c19f5529d2ea03187e12946b
 2020-09-19 23:42:36 +00:00
Jooyung Han
ed8016598a Merge "ueventd: scans /apex/*/firmware for firmwares" am: 62ccfa0c61 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429856

Change-Id: I541c8c6ce99c3d47ede3e5524d0f4042f9ff52b9
 2020-09-19 23:18:51 +00:00
Jooyung Han
62ccfa0c61 Merge "ueventd: scans /apex/*/firmware for firmwares" 2020-09-19 22:47:26 +00:00
Josh Gao
74246334dd Merge "adbd: Fix check against valid payload size" am: 596f3b5384 am: 9a80494702 am: aeb5be6f45 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117

Change-Id: I8edbc03fa678a549cf037699b7ab2f6d953b4a44
 2020-09-19 07:04:39 +00:00
Peter Collingbourne
45fcd895d9 Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." am: 43ebae3e5d am: 3d54f29163 am: 77d4d78d93 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1427037

Change-Id: Iaec67ca9483ed9de29222b013a0b57cc0668f7ca
 2020-09-19 07:04:17 +00:00
Bill Yi
711c663f04 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 691a80ca09 am: de31e1689c -s ours am: 8d2df7cafc -s ours 
am skip reason: Change-Id Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e with SHA-1 010061551c is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: Ic16044870255320fa8a70b97c16d686efe2f8750
 2020-09-19 07:01:25 +00:00
Bill Yi
eb3fb0ec02 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 34ecedbcc8 am: cf105b5e1a -s ours am: 786dc7479e -s ours 
am skip reason: Change-Id Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e with SHA-1 010061551c is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: I2671402e44ec2fe7a9a97fdecf8ae85311fe6fe1
 2020-09-19 07:00:59 +00:00
Josh Gao
aeb5be6f45 Merge "adbd: Fix check against valid payload size" am: 596f3b5384 am: 9a80494702 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117

Change-Id: I6818a334a1a9655cc590805f17f129471d427821
 2020-09-19 06:26:45 +00:00
Peter Collingbourne
77d4d78d93 Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." am: 43ebae3e5d am: 3d54f29163 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1427037

Change-Id: Idac612d0bad72f2a35c0873a707ca10a190689c7
 2020-09-19 06:19:39 +00:00
Bill Yi
8d2df7cafc [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 691a80ca09 am: de31e1689c -s ours 
am skip reason: Change-Id Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e with SHA-1 010061551c is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: Ia453e2c9dc766117ff77911e32476790009aff69
 2020-09-19 05:51:31 +00:00
Bill Yi
786dc7479e [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 34ecedbcc8 am: cf105b5e1a -s ours 
am skip reason: Change-Id Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e with SHA-1 010061551c is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: I40bb747ece562129c8d57cf02a933a18e8da29f2
 2020-09-19 05:50:36 +00:00
Josh Gao
9a80494702 Merge "adbd: Fix check against valid payload size" am: 596f3b5384 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117

Change-Id: If2d4f89a99e1c5d877313b23ef9857e30c106abe
 2020-09-19 05:46:00 +00:00
Peter Collingbourne
3d54f29163 Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." am: 43ebae3e5d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1427037

Change-Id: I5497bb0d4692db12e057927b551331466a456872
 2020-09-19 05:35:45 +00:00
Bill Yi
de31e1689c Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 691a80ca09 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: I74319a4fc56145bee7851a0916b3f6cd26479a02
 2020-09-19 05:23:10 +00:00
Bill Yi
cf105b5e1a Merge mainline-release 6664920 to master - DO NOT MERGE am: 34ecedbcc8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: I6ebb700c17f11d427e3299f14b52bdbb44537693
 2020-09-19 05:22:40 +00:00
Jooyung Han
21cad321db ueventd: scans /apex/*/firmware for firmwares 
In addition to "firmware_directories", ueventd scans /apex/*/firmware/
directory as well to find firmware files.

Bug: 167942098
Test: loading firmware from vibrator apex successfully.
      (sunfish)
Change-Id: I90fc8f9ad843a08b1ca98a2be1b5d22c0c5954a3
 2020-09-19 08:07:35 +09:00
Josh Gao
596f3b5384 Merge "adbd: Fix check against valid payload size" 2020-09-18 23:01:18 +00:00
Tom Cherry
a5edc0fbbc Use libcutils_headers for android_filesystem_config.h 
android_filesystem_config.h is found since system/core/include is on
the include path for all projects and contains a symlink to the real
android_filesystem_config.h.  This is fragile and the below bug seeks
to remove this symlink and have users correctly depend on
libcutils_headers.

Bug: 165825252
Test: build
Change-Id: I1aad6a2e8fbe87635e97b0ac1be3414403353382
 2020-09-18 22:48:42 +00:00
Tom Cherry
6533fff0e0 logd: remove min heap in SerializedFlushToState 
There was a bug in SerializedFlushToState::Prune() caused by an access
to a SerializedLogEntry raw pointer as a member of a MinHeapElement,
which was deleted earlier in the function.

Instead of just fixing the order of the access and the deletion, I
sought out to remove the raw pointer entirely.  In doing so, I noticed
that the min heap doesn't provide significant benefit, since we'll
only ever have 8 log buffers so scalability is not an issue.

Therefore this change removes the min heap entirely and uses the
existing log_position_ and logs_needed_from_next_position_ members to
keep track of which are the next unread logs.

It also adds a smoke test for SerializedFlushToState::Prune() and
additional CHECK() statements to help prevent future errors.

Bug: 168869299
Test: unit tests
Change-Id: Id4d5fdbaff2fe6dc49c38f01e73f900f84d3696b
 2020-09-18 15:32:32 -07:00
Peter Collingbourne
43ebae3e5d Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." 2020-09-18 22:00:53 +00:00
David Anderson
2f11ec6a13 libsnapshot: Prototype the new API for mapping writable snapshots. 
Since we can't provide a single device or fd anymore, we need to expose
a CowWriter directly. Additionally, we expose an API for reading
snapshots through the FileDescriptor abstraction.

Bug: 168554689
Test: builds
Change-Id: If7e8adbfe69c2a84d34c63d4b0adff2b3365fd82
 2020-09-18 14:24:40 -07:00
Christopher Ferris
b49ffd6f78 Merge "Fix x86_64 check for signal handler." am: 36991d8e26 am: 0a8f898eee am: fb5b39c235 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430216

Change-Id: I24d48759a04f2c86790f6b512462a98436bc9e33
 2020-09-18 19:40:56 +00:00