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

79835 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tri Vo
dc2c33d3d9 Merge "Changes to adapt confirmationui AIDL spec." am: 7014fa9fa3 am: 7fee997381 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251741

Change-Id: Icf7a0729780e253b149b4c63c1d3f9f199b3cbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:53:17 +00:00
Bart Van Assche
d181396ab7 Merge "init/epoll: Stop using smart pointers" am: 51706e7718 am: f7b798d767 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255743

Change-Id: If44689f999fce9db57cefa18ea3ebf630abf0e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:53:01 +00:00
Bart Van Assche
17e44c16c8 Merge "init/epoll: Make Epoll::Wait() easier to use" am: 72b884ba91 am: 65aa1f6e7f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255999

Change-Id: I2c6a36cb5239e4bf91c8856f0c9a5963bce785c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:52:52 +00:00
Bart Van Assche
e1fab32705 Merge "init/epoll: Switch to aggregate initialization" am: 44d7397b98 am: ba1e74fadf 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2256000

Change-Id: I7b3eddadfd814fc05fe940a581b5fe17ed60ee9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:52:43 +00:00
Bart Van Assche
b70c05eb7e Merge "init: Improve readability of the code in SecondStageMain()" am: 5c7dc40926 am: efe3c9fb86 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2258417

Change-Id: I052962fa2c6e7d0d3940700158c4f8331937e135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:52:22 +00:00
Tri Vo
7fee997381 Merge "Changes to adapt confirmationui AIDL spec." am: 7014fa9fa3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251741

Change-Id: Ibdacf1d3ec047002fca69341e731fc3e233c3300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:07:33 +00:00
Bart Van Assche
f7b798d767 Merge "init/epoll: Stop using smart pointers" am: 51706e7718 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255743

Change-Id: I93621555fb172e12666e2cdd04f3892748241f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:06:58 +00:00
Bart Van Assche
65aa1f6e7f Merge "init/epoll: Make Epoll::Wait() easier to use" am: 72b884ba91 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255999

Change-Id: I198a06c8bea1ca4f17c4641f3a1c4d0872f077c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:06:41 +00:00
Bart Van Assche
ba1e74fadf Merge "init/epoll: Switch to aggregate initialization" am: 44d7397b98 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2256000

Change-Id: I6692472cc2af35c7e8a598ed48b62bb15e5cb499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:06:29 +00:00
Bart Van Assche
efe3c9fb86 Merge "init: Improve readability of the code in SecondStageMain()" am: 5c7dc40926 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2258417

Change-Id: I7004b874afc98754cdbc9f1d9c5a96b5746aeb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 17:06:01 +00:00
Tri Vo
7014fa9fa3 Merge "Changes to adapt confirmationui AIDL spec." 2022-10-20 16:51:56 +00:00
Bart Van Assche
51706e7718 Merge "init/epoll: Stop using smart pointers" 2022-10-20 16:36:05 +00:00
Bart Van Assche
72b884ba91 Merge "init/epoll: Make Epoll::Wait() easier to use" 2022-10-20 16:35:49 +00:00
Bart Van Assche
44d7397b98 Merge "init/epoll: Switch to aggregate initialization" 2022-10-20 16:34:58 +00:00
Bart Van Assche
5c7dc40926 Merge "init: Improve readability of the code in SecondStageMain()" 2022-10-20 16:34:21 +00:00
Bart Van Assche
dcd23dfc58 init/epoll: Stop using smart pointers 
Change the type of 'handler' from std::shared_ptr<Handler> into Handler.
This change is safe since a previous CL moved the handler calls from the
Epoll::Wait() caller into Epoll::Wait() itself.

Bug: 213617178
Change-Id: Ife79e6863536b96ee4bb3cd778f6b0b164a95fed
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-20 09:32:51 -07:00
Bart Van Assche
bc5c4a4659 init/epoll: Make Epoll::Wait() easier to use 
Invoke the callback functions from inside Epoll::Wait() instead of
returning a vector with pointers to callback functions. Remove handlers
after handler invocation finished to prevent that self-removal triggers
a use-after-free.

The CL that made Epoll::Wait() return a vector is available at
https://android-review.googlesource.com/c/platform/system/core/+/1112042.

Bug: 213617178
Change-Id: I52c6ade5746a911510746f83802684f2d9cfb429
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-20 09:32:51 -07:00
Bart Van Assche
a1c8a622b2 init/epoll: Switch to aggregate initialization 
Make it easier to verify for humans that all data structure members are
initialized. No functionality is changed.

Bug: 213617178
Change-Id: I1ce2af566dba51f2032f2e7518576a67e666d12e
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-20 09:32:51 -07:00
Bart Van Assche
4842650043 init: Improve readability of the code in SecondStageMain() 
Change the type of epoll_timeout from
std::optional<std::chrono:milliseconds> into std::chrono::milliseconds.
No functionality is changed.

Bug: 213617178
Change-Id: Ieb150e0aeabdb79c8da4649875ea3ed59297343b
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-20 09:32:51 -07:00
Yi-yo Chiang
9535f23a59 Merge "Revert "fs_mgr_overlayfs: Revert to use /data only if VAB"" am: cc7ddc04f9 am: fc25bd7c70 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2248415

Change-Id: I9b24801a2aa017d587cbc4358da767a447a1bc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 09:05:05 +00:00
Yi-yo Chiang
fc25bd7c70 Merge "Revert "fs_mgr_overlayfs: Revert to use /data only if VAB"" am: cc7ddc04f9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2248415

Change-Id: I43a810960f824f6c518ce81cce8fe6fcd0953408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 08:38:02 +00:00
Yi-yo Chiang
cc7ddc04f9 Merge "Revert "fs_mgr_overlayfs: Revert to use /data only if VAB"" 2022-10-20 08:11:57 +00:00
Tri Vo
3307d79295 Merge "Trusty IRemotelyProvisionedComponent v3 HAL implementation" am: a693071690 am: 2f6849126e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2239818

Change-Id: Ia2e7d401b66c9f8377428fe4f107f5b0342ba578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 03:41:53 +00:00
Tri Vo
2f6849126e Merge "Trusty IRemotelyProvisionedComponent v3 HAL implementation" am: a693071690 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2239818

Change-Id: I190b63aa9c9a2bb3fe1090e6b85170f60a37b4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 03:15:00 +00:00
Tri Vo
a693071690 Merge "Trusty IRemotelyProvisionedComponent v3 HAL implementation" 2022-10-20 02:43:12 +00:00
Treehugger Robot
0ebfbc21ef Merge "init/epoll: Fix a potential use-after-free" am: 9c3113ab46 am: a0d6b24f9d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260824

Change-Id: Icdff1481f5f9dd5b71aa2d4693f1a4bfd3bd9ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 01:28:18 +00:00
Treehugger Robot
a0d6b24f9d Merge "init/epoll: Fix a potential use-after-free" am: 9c3113ab46 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260824

Change-Id: I33bc5478818874ca47471c03ec450f8c112e5376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-20 01:00:20 +00:00
Treehugger Robot
9c3113ab46 Merge "init/epoll: Fix a potential use-after-free" 2022-10-20 00:38:06 +00:00
Akilesh Kailash
0490f835b1 Merge "libsnapshot: Changes to AddCopy() API" am: ad5cc05ca2 am: d3c48d800c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2261080

Change-Id: I66f4578a74ef404e4f2aefe12edc19a06cc39863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 22:00:13 +00:00
Akilesh Kailash
d3c48d800c Merge "libsnapshot: Changes to AddCopy() API" am: ad5cc05ca2 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2261080

Change-Id: I3a87da1b2828615261137bea2190b950f00f22ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 21:30:49 +00:00
Akilesh Kailash
ad5cc05ca2 Merge "libsnapshot: Changes to AddCopy() API" 2022-10-19 20:56:20 +00:00
Akilesh Kailash
b23bf16efc libsnapshot: Changes to AddCopy() API 
If the copy blocks are contiguous, add a third
argument which takes the number of blocks
which are contiguous. With this, update engine
can call the API in one shot for all the
contiguous COPY operations.

This is required for batching the I/O
for async writes.

This should still continue to support the existing
API where we pass one COPY block at a time.

Bug: 254188450
Test: Incremental OTA from A->B with new API changes in A
      Incremental OTA from A->B with plain VAB
      cow_api_test
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I7edc52a152e02de28a44ef1dc2c88b76a28c4109
 2022-10-19 17:55:52 +00:00
Treehugger Robot
8121b64d60 Merge "init: Introduce Epoll::SetFirstCallback()" am: 9457a9ab72 am: aabaa0aeac 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255998

Change-Id: Ie8f9b6ff0f9e044a3bcea37a1b233476f9bd75ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-19 00:27:08 +00:00
Treehugger Robot
aabaa0aeac Merge "init: Introduce Epoll::SetFirstCallback()" am: 9457a9ab72 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255998

Change-Id: I37b63a6f46d1034c094de7193690a41caf3d35bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 23:56:56 +00:00
Bart Van Assche
b0177a0828 init/epoll: Fix a potential use-after-free 
If UnregisterHandler() is called from inside a handler for an event that
has not yet been processed then that will result in a use-after-free.
Fix this by passing file descriptors to epoll_ctl() instead of pointers
to map elements.

Bug: 213617178
Change-Id: Ie62e3a299af964271ec24cd8fc2e794042b77ee6
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-18 16:34:12 -07:00
Treehugger Robot
9457a9ab72 Merge "init: Introduce Epoll::SetFirstCallback()" 2022-10-18 23:29:50 +00:00
Akilesh Kailash
6b93d71541 Merge changes I7681e9a4,If84ff730 am: 63190d2e3a am: 7c5e1562e3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260463

Change-Id: Iad2b707311e51a5aa08568c5069323ab746dff20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:55:39 +00:00
Akilesh Kailash
7c5e1562e3 Merge changes I7681e9a4,If84ff730 am: 63190d2e3a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260463

Change-Id: Id8bcec0159e7681ec9a0bf6a3376ca19b0cd892e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 22:27:42 +00:00
Akilesh Kailash
63190d2e3a Merge changes I7681e9a4,If84ff730 
* changes:
  libsnapshot: Refactor compress function
  libsnapshot: Refactor code
 2022-10-18 21:58:16 +00:00
Treehugger Robot
51d9d931c4 Merge "init/epoll_test: Improve this test" am: 6314ba7f76 am: 394cc04df5 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2258416

Change-Id: I9892c2fa47978b36be554dbe69223584af36171d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:55:57 +00:00
Treehugger Robot
394cc04df5 Merge "init/epoll_test: Improve this test" am: 6314ba7f76 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2258416

Change-Id: Ibad775cb5f940806abd24856d5718a6b5b542d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 21:26:33 +00:00
Treehugger Robot
6314ba7f76 Merge "init/epoll_test: Improve this test" 2022-10-18 21:08:00 +00:00
Treehugger Robot
c35179a91f Merge "Remove an obsolete workaround." am: 7facdcca3d am: 2ad17c8d00 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260461

Change-Id: If7dfecd0dea86943d909a12814a6241cf85644de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 18:56:50 +00:00
Treehugger Robot
2ad17c8d00 Merge "Remove an obsolete workaround." am: 7facdcca3d 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260461

Change-Id: Ifcc71c54c43086ec4bbf53e05040dd96b7cf57af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 18:27:37 +00:00
Treehugger Robot
7facdcca3d Merge "Remove an obsolete workaround." 2022-10-18 17:59:09 +00:00
Akilesh Kailash
1119e8e018 libsnapshot: Refactor compress function 
Move compress() function to a dedicated file.
This is in preparation for variable block size
compression and async writes.

No change in functional logic.

Bug: 254188450
Test: Full OTA Pixel
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I7681e9a4d884eac1ccbf8adeb1fc6bd1a9fedfa6
 2022-10-18 16:49:02 +00:00
Akilesh Kailash
e8f6a126fb libsnapshot: Refactor code 
Move all files related to libsnapshot_cow library to
a seperate directory. Libsnapshot directory is getting
crowded and we will be adding more files to this library
with async writes.

No changes to any logic.

Bug: 254188450
Test: Full OTA on Pixel
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: If84ff730d477c85a8ef57864d2185f2f897cf8e0
 2022-10-18 16:48:33 +00:00
Elliott Hughes
06a839fc77 Remove an obsolete workaround. 
Bug: http://b/29412086
Test: treehugger
Change-Id: I3a61db8da234b4c150816af264d796da7dfe0af6
 2022-10-18 16:31:04 +00:00
Bart Van Assche
a2c160449b init: Introduce Epoll::SetFirstCallback() 
Prepare for optimizing Epoll::Wait() by moving the
ReapAnyOutstandingChildren() call into Epoll::Wait(). No functionality
is changed.

Bug: 213617178
Change-Id: I280ea0069ed29cf323e4177ec500b30b900f7c8d
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-18 09:17:55 -07:00
Bart Van Assche
20954a8e34 init/epoll_test: Improve this test 
Add a move constructor in the CatchDtor class. Check the .emplace()
result. Simplify the destructor. Initialize handler_invoked. Explain the
purpose of this test.

Bug: 213617178
Change-Id: I4d6f97dbb2705a2f2dd78e449ae8de74e90b102f
Signed-off-by: Bart Van Assche <bvanassche@google.com>
 2022-10-18 09:17:55 -07:00