Commit Graph

71889 Commits

Author SHA1 Message Date
David Anderson 6a4c173e2d Merge "libsnapshot: Move ImageManager creation to DeviceInfo." am: 9ac43f5421 am: 260c7f6e3d am: 57a440d2a2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705662

Change-Id: Ia0693f37e48000e7943f4b3f89f9e22fa5fcf7a3
2021-05-14 01:16:06 +00:00
David Anderson 57a440d2a2 Merge "libsnapshot: Move ImageManager creation to DeviceInfo." am: 9ac43f5421 am: 260c7f6e3d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705662

Change-Id: I88c8587d38550e8d33834fba6359a7344e8f2c8f
2021-05-14 00:44:30 +00:00
David Anderson 260c7f6e3d Merge "libsnapshot: Move ImageManager creation to DeviceInfo." am: 9ac43f5421
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705662

Change-Id: I29ed378aa7c22664156572452184172f6044a368
2021-05-14 00:29:31 +00:00
David Anderson 9ac43f5421 Merge "libsnapshot: Move ImageManager creation to DeviceInfo." 2021-05-14 00:12:41 +00:00
Peter Collingbourne aa544796ae Run MTE tests on zero-sized allocations.
Bug: 187879470
Change-Id: I9547f3032af9d1a921f8597a53389d25af33b369
2021-05-13 14:08:41 -07:00
Elliott Hughes 1056bd564e Merge "Remove String16::remove." am: e9c7c5c80c am: 50d6fc417e am: 203cdf89fc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1704013

Change-Id: I5e718c0920791a41ee4a5638b81465a406d783e1
2021-05-13 19:44:55 +00:00
Elliott Hughes 203cdf89fc Merge "Remove String16::remove." am: e9c7c5c80c am: 50d6fc417e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1704013

Change-Id: If8fa89c9dd4a726d3599a486eb78649da24acd7c
2021-05-13 19:34:16 +00:00
Elliott Hughes 50d6fc417e Merge "Remove String16::remove." am: e9c7c5c80c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1704013

Change-Id: I52be9e6ce3fbdefca14317ad12ea3e536e73c704
2021-05-13 19:19:01 +00:00
Elliott Hughes e9c7c5c80c Merge "Remove String16::remove." 2021-05-13 19:04:33 +00:00
David Anderson b2ee4c14c9 libsnapshot: Move ImageManager creation to DeviceInfo.
This refactoring moves ImageManager creation out of SnapshotManager,
where it had always been rather awkward, and into IDeviceInfo so it can
participate in dependency injection.

The "first-stage init" state is now part of IDeviceInfo as well.

Bug: 187396878
Test: vts_libsnapshot_test
      libsnapshot_fuzzer_test
Change-Id: Ic4b3e93527cc074ec18c0c26440dbdb2504d0d5e
2021-05-13 11:33:38 -07:00
David Srbecky 160270690b Merge "Update API of MapInfo from libunwindstack" am: 1cbdc2a530 am: 17191002b7 am: 55e24d1340
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705307

Change-Id: I646c25bef6a2bb392a2c5da7a0323f4638d0aaf9
2021-05-13 10:40:57 +00:00
David Srbecky 55e24d1340 Merge "Update API of MapInfo from libunwindstack" am: 1cbdc2a530 am: 17191002b7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705307

Change-Id: I2c0d03b7e8ec134fef4716e2eb20116b2512f826
2021-05-13 10:23:45 +00:00
David Srbecky 17191002b7 Merge "Update API of MapInfo from libunwindstack" am: 1cbdc2a530
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705307

Change-Id: I2a6925ede88a55f75279489443fca2d6acca844a
2021-05-13 10:08:14 +00:00
David Srbecky 1cbdc2a530 Merge "Update API of MapInfo from libunwindstack" 2021-05-13 09:49:52 +00:00
Peter Collingbourne d6a4575224 Merge "Test that out-of-bounds UAF is not detected with MTE." am: fc7852b741 am: 4e122e057c am: 8958c32319
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705657

Change-Id: Ibaebbbded90dca299acc9e8e07ad532e0738b4c1
2021-05-13 04:32:26 +00:00
Peter Collingbourne 8958c32319 Merge "Test that out-of-bounds UAF is not detected with MTE." am: fc7852b741 am: 4e122e057c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705657

Change-Id: I90ff2584a0ced92170730c9173c31472dd87f66d
2021-05-13 03:29:30 +00:00
Peter Collingbourne 4e122e057c Merge "Test that out-of-bounds UAF is not detected with MTE." am: fc7852b741
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705657

Change-Id: I7ab42ac3206660ba073dd4d06d30a3d9ce7bb095
2021-05-13 03:15:47 +00:00
Peter Collingbourne fc7852b741 Merge "Test that out-of-bounds UAF is not detected with MTE." 2021-05-13 02:53:23 +00:00
David Srbecky d8ab48b4db Update API of MapInfo from libunwindstack
Use accessors to for all the fields.

Test: build
Change-Id: I68d149d914d4a4b088aaf822fe222a5d9e56ae80
2021-05-13 01:51:58 +01:00
Peter Collingbourne dc47634ec4 Test that out-of-bounds UAF is not detected with MTE.
This type of error is unlikely and attempting to detect it with MTE
is likely to produce false positive reports. Make sure that this type
of error is not detected by the allocator.

Change-Id: I90676d1a031411d6b725890311317802bc24b459
2021-05-12 15:56:43 -07:00
Elliott Hughes 2cf0411910 Remove String16::remove.
This function, ironically, is being removed.

Even more amusing, it was never "remove" anyway --- it literally did
the opposite, and removed everything *except* the range you passed to
it, and should probably have been called "keep"!

I'm looking at reimplementing much of libutils, but first I'm improving
test coverage, and literally every test I wrote for this failed. And
then when I fixed the "obvious bugs" in the implementation, I found
there actually were a couple of existing unit tests --- that mostly
served to demonstrate just how counter-intuitive this function was.

Bug: http://b/156999009
Test: treehugger
Change-Id: I41fd85f7c0988070f4039f607d2e57523d862ed9
2021-05-12 20:24:26 +00:00
Akilesh Kailash 3055d4b780 Merge "snapuserd: Remove assertions from daemon" am: fcd105d5dd am: c362b175df am: d46c4a6c21
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705025

Change-Id: Ieb6667f77900d3e3607ca05352a00efcc1b5535c
2021-05-12 19:00:14 +00:00
Treehugger Robot 70673be9dd Merge "libutils: remove the unused StopWatch lap functionality." am: 0839837fa4 am: 5c28af9897 am: 038077c1c5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1703652

Change-Id: If73e10e9321af420ff32b992a6df4f8dd9e5a911
2021-05-12 19:00:08 +00:00
Akilesh Kailash d46c4a6c21 Merge "snapuserd: Remove assertions from daemon" am: fcd105d5dd am: c362b175df
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705025

Change-Id: Ic10634d55539e3752d7349971f6dc97031f72223
2021-05-12 18:40:21 +00:00
Treehugger Robot 038077c1c5 Merge "libutils: remove the unused StopWatch lap functionality." am: 0839837fa4 am: 5c28af9897
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1703652

Change-Id: I0d1cd112e189c18e43f1e0bc3b53e2b95455c6c5
2021-05-12 18:40:16 +00:00
Akilesh Kailash c362b175df Merge "snapuserd: Remove assertions from daemon" am: fcd105d5dd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1705025

Change-Id: Ic0ecea6937a49ed7fae18dabcf720eb9461ba834
2021-05-12 18:23:12 +00:00
Treehugger Robot 5c28af9897 Merge "libutils: remove the unused StopWatch lap functionality." am: 0839837fa4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1703652

Change-Id: I85025cf1cb2e990d6a0ed9d70642e33f6bb67f35
2021-05-12 18:21:43 +00:00
Akilesh Kailash fcd105d5dd Merge "snapuserd: Remove assertions from daemon" 2021-05-12 18:04:22 +00:00
Akilesh Kailash 2a89cf82fa snapuserd: Remove assertions from daemon
Assertions in daemon will terminate the daemon.
This can bring the entire device to halt as the mount partitions
are mounted of snapshot devices and IO's will be hung in
"D" (uninterruptible state) eventually leading to sysrq crash.

Convert the relevant assertions into appropriate error codes and
propagate the error code back to dm-user.
IO will eventually fail but should not impact the overall usage of the device.

Bug: 187903835
Test: vts_libsnapshot, cow_snapuserd_test, full OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Iaf093898837d2aff5703ea1e615aecf7c1e53a8f
2021-05-12 17:31:38 +00:00
Paul Duffin 69caa70145 Add missing //apex_available:platform to debuggerd
This does not currently cause any problems but it does block progress
on the referenced bugs.

Bug: 187910671
Bug: 187914588
Test: m droid
Change-Id: I977cd842101187441ddbc873eac25598295aab06
2021-05-12 11:22:55 +01:00
Elliott Hughes dc334a7c8f Remove String16::remove tests.
These tests are only in internal right now, preventing me from removing
this function entirely. So let's get them out of the way...

Test: treehugger
Ignore-AOSP-First: workaround for presubmit merge conflict
Bug: http://b/35267372
Change-Id: Ib5de178ffad833c87e8e93bfd33e85a0ff504ac0
2021-05-12 03:57:26 +00:00
Treehugger Robot 0839837fa4 Merge "libutils: remove the unused StopWatch lap functionality." 2021-05-12 01:38:10 +00:00
Elliott Hughes afa6e9fc04 libutils: remove the unused StopWatch lap functionality.
It's not tested, and it's not used. Also remove the fuzzer which is just
wasting CPU cycles.

This gets us to 100% function coverage, 100% line coverage, and N/A
branch coverage for StopWatch.

Test: treehugger
Change-Id: Ib5e08510ef1046a6f2af3f0b8a1c317a8bb39fd4
2021-05-11 16:33:47 -07:00
Treehugger Robot 6801ff60bb Merge "libutils: remove obsolete README." am: c85c9ee4e6 am: 542b434331 am: 47f22f9ba7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1703649

Change-Id: I1c3156ddd57102f5ba29c34b2b3b8474ca1aff7f
2021-05-11 21:46:30 +00:00
Treehugger Robot 469cdabcb6 Merge "Fix CtsFsMgrTestCases failures" am: 661c65dc07 am: a5fb17a6d3 am: 6d8c4ede23
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1702765

Change-Id: I03a7fee0bfa93cba2ff8d34034fb3d832dbacfa0
2021-05-11 21:46:19 +00:00
Treehugger Robot 47f22f9ba7 Merge "libutils: remove obsolete README." am: c85c9ee4e6 am: 542b434331
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1703649

Change-Id: I51bdbd1f071a434331fece477b482f2767dd3db9
2021-05-11 21:26:00 +00:00
Treehugger Robot 6d8c4ede23 Merge "Fix CtsFsMgrTestCases failures" am: 661c65dc07 am: a5fb17a6d3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1702765

Change-Id: I8685c025468448e6ebf13261e5fb46e6d578448c
2021-05-11 21:25:52 +00:00
Treehugger Robot 542b434331 Merge "libutils: remove obsolete README." am: c85c9ee4e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1703649

Change-Id: Iea4982cb106678e67bfc5440e6e1ac05753006b0
2021-05-11 21:11:02 +00:00
Treehugger Robot c85c9ee4e6 Merge "libutils: remove obsolete README." 2021-05-11 20:56:19 +00:00
Elliott Hughes af021e87a6 libutils: remove obsolete README.
This dates from when libutils was still part of frameworks, and talks
about stuff that *didn't* move out of frameworks.

Test: treehugger
Change-Id: Icf22eebc417bcb37abdbfdc89e9a3f14894e18c2
2021-05-11 12:01:26 -07:00
Treehugger Robot a5fb17a6d3 Merge "Fix CtsFsMgrTestCases failures" am: 661c65dc07
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1702765

Change-Id: I6127464577b5f7d67aa202346e4f333740661d83
2021-05-11 07:41:20 +00:00
Treehugger Robot 661c65dc07 Merge "Fix CtsFsMgrTestCases failures" 2021-05-11 07:13:17 +00:00
Yi-Yo Chiang e3cbb0a9eb Fix CtsFsMgrTestCases failures
fs_mgr flags "slotselect" and "slotselect_other" are specific to A/B
devices, so remove these options from testcases because
CtsFsMgrTestCases could be ran on a non-A/B device.

Fixes: 187759127
Fixes: 187427233
Test: atest CtsFsMgrTestCases on sdk_phone64_x86_64-userdebug
Change-Id: I31c1429652629bb68e0ca504295c959ac7e013e2
2021-05-11 07:12:22 +00:00
Tianjie Xu 0a2bb08371 Merge "Add a unittest for fingerprint calculation" am: 023ac49db2 am: b026f15df0 am: 8408b03092
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1698093

Change-Id: Ic7cca5299f5a9f06cfc701990bcf781e3103f82f
2021-05-11 07:00:04 +00:00
Tianjie Xu 8408b03092 Merge "Add a unittest for fingerprint calculation" am: 023ac49db2 am: b026f15df0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1698093

Change-Id: Ib33d8e677da18777b84261cb6a35cdca24d59268
2021-05-11 06:40:54 +00:00
Tianjie Xu b026f15df0 Merge "Add a unittest for fingerprint calculation" am: 023ac49db2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1698093

Change-Id: Idde08ad61cad08d8c45e63a8c3c361060df5405b
2021-05-11 06:23:59 +00:00
Tianjie Xu 023ac49db2 Merge "Add a unittest for fingerprint calculation" 2021-05-11 06:08:53 +00:00
Akilesh Kailash 4d20751ce5 Merge "snapuserd: Fix merging of overlapping copy blocks" am: 0efd6c2a4c am: 64b0b1a54e am: 9cfe067b2b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1700825

Change-Id: Ic577a48ace9c1cbdbdf4eca45cba8e1bb86a9773
2021-05-10 21:37:51 +00:00
Akilesh Kailash 9cfe067b2b Merge "snapuserd: Fix merging of overlapping copy blocks" am: 0efd6c2a4c am: 64b0b1a54e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1700825

Change-Id: I9b911cd1d0db77c6d2b9b67a1891dab7f9365214
2021-05-10 21:19:20 +00:00
Akilesh Kailash 64b0b1a54e Merge "snapuserd: Fix merging of overlapping copy blocks" am: 0efd6c2a4c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1700825

Change-Id: I63bcfb9878600baa696a03dfe0475d13334be9a7
2021-05-10 21:02:35 +00:00