David Anderson
e88f53fab6
Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main am: 5b91ae9f4e
am: b8cf4b820f
am: a3e13cff17
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2698913
Change-Id: Ib6c716a8a001b857063fad326a190aadec9876ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 00:50:51 +00:00
David Anderson
a3e13cff17
Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main am: 5b91ae9f4e
am: b8cf4b820f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2698913
Change-Id: Id697af0a1cf2c7d7710f327788b3206646bbfd08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 00:04:29 +00:00
David Anderson
b8cf4b820f
Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main am: 5b91ae9f4e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2698913
Change-Id: Ia766fe856c9f507def6a4912f05a85c1c0c89631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 23:12:42 +00:00
David Anderson
5b91ae9f4e
Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main
2023-08-29 22:10:27 +00:00
Xin Li
ded776eaf8
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: fcae454545
-s ours am: 0fc20d6cbb
-s ours
...
am skip reason: Merged-In I849958d9e9de3be48e32f57acc7b3526e184482c with SHA-1 8cbbc2dc92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24183044
Change-Id: Ia17b4bf7273b8e5d44a4e0c66280088a81eafbbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:40:03 +00:00
Xin Li
a8d03ccb89
[automerger skipped] Merge Android U (ab/10368041) am: 4484eb1bfd
-s ours am: 482d9d1e40
-s ours
...
am skip reason: Merged-In I849958d9e9de3be48e32f57acc7b3526e184482c with SHA-1 8cbbc2dc92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24183044
Change-Id: If7ef831b7006969e44803c1cbf60d24b3521be96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:09 +00:00
Xin Li
0fc20d6cbb
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: fcae454545
-s ours
...
am skip reason: Merged-In I849958d9e9de3be48e32f57acc7b3526e184482c with SHA-1 8cbbc2dc92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24183044
Change-Id: I3826d38bea1e1f042c9abfdc103c70690e975634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:04:05 +00:00
Xin Li
482d9d1e40
[automerger skipped] Merge Android U (ab/10368041) am: 4484eb1bfd
-s ours
...
am skip reason: Merged-In I849958d9e9de3be48e32f57acc7b3526e184482c with SHA-1 8cbbc2dc92
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24183044
Change-Id: Id2d7c83c8284edbd1fd11ec9944f58ddb8332327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:09 +00:00
Xin Li
fcae454545
Merge "Merge Android U (ab/10368041)" into aosp-main-future
2023-08-28 22:12:53 +00:00
Treehugger Robot
0b24dcf869
Merge "Make simg2img host-only" into main am: 5aa25bf3ae
am: f148dbb40d
am: edd616e926
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727087
Change-Id: Id3896953a281a150374eb417c53ed9a66af1bbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 20:08:07 +00:00
Treehugger Robot
edd616e926
Merge "Make simg2img host-only" into main am: 5aa25bf3ae
am: f148dbb40d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727087
Change-Id: I97c71bce9ec87f2d789d74f222c1f0d3a0a7f6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:19:52 +00:00
Treehugger Robot
f148dbb40d
Merge "Make simg2img host-only" into main am: 5aa25bf3ae
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727087
Change-Id: Iafb0bb217f3c72d579c90cb0a8b005ce877ec1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 18:35:38 +00:00
Treehugger Robot
5aa25bf3ae
Merge "Make simg2img host-only" into main
2023-08-28 17:44:24 +00:00
Cole Faust
81c4e225bf
Make simg2img host-only
...
This is supposed to be a host tool, but was being installed on
cuttlefish devices.
Bug: 205632228
Test: Presubmits
Change-Id: I9eb1ae1a5c171253617fa12283e2ec651afb5539
2023-08-28 09:53:30 -07:00
Xin Li
4484eb1bfd
Merge Android U (ab/10368041)
...
Bug: 291102124
Merged-In: I849958d9e9de3be48e32f57acc7b3526e184482c
Change-Id: Ic765b54aa981b6370b5dff6b4cf046bbe9fbdbaf
2023-08-25 13:54:47 -07:00
Treehugger Robot
ba8441f90e
Merge "Migrate from android::String isEmpty to empty" into main am: 18560efc30
am: 0bb51f7606
am: 60397afb11
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705823
Change-Id: I6d035664c1e67cfbffce170c7be5fd68216459bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 18:26:02 +00:00
David Anderson
0e05170078
Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main am: c718295a58
am: 9077049910
am: d17c3ebb40
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701653
Change-Id: If8d65e1284c8d0700cd7d3531922c1327ad4f6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 18:24:36 +00:00
Treehugger Robot
60397afb11
Merge "Migrate from android::String isEmpty to empty" into main am: 18560efc30
am: 0bb51f7606
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705823
Change-Id: Idf32d93572278e9381004390e26a30fde8cd4777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:45:43 +00:00
David Anderson
d17c3ebb40
Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main am: c718295a58
am: 9077049910
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701653
Change-Id: I70266a09d368ec05343bfd957f45706a0cddb777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:45:08 +00:00
Treehugger Robot
0bb51f7606
Merge "Migrate from android::String isEmpty to empty" into main am: 18560efc30
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705823
Change-Id: I0e36482d480ab8396c42095239e88f560f4d1d99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:41:56 +00:00
Treehugger Robot
18560efc30
Merge "Migrate from android::String isEmpty to empty" into main
2023-08-25 17:07:42 +00:00
David Anderson
9077049910
Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main am: c718295a58
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701653
Change-Id: I62acd8492c2e2761584f2490c8b2db27dcfe3838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:01:19 +00:00
Snehal Koukuntla
b6aef064fc
Merge "Add UUIDs to profraw filenames" into main am: c174f14617
am: 17a2bf47b6
am: da3b01db4d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2706079
Change-Id: Idec294c40fcdd240832c9e61879f54bfb249becc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 16:21:00 +00:00
David Anderson
c718295a58
Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main
2023-08-25 16:09:35 +00:00
Snehal Koukuntla
da3b01db4d
Merge "Add UUIDs to profraw filenames" into main am: c174f14617
am: 17a2bf47b6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2706079
Change-Id: Ib9270d9184cc2e05a28cce934c6ccc94ca1fe486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 15:39:20 +00:00
Snehal Koukuntla
17a2bf47b6
Merge "Add UUIDs to profraw filenames" into main am: c174f14617
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2706079
Change-Id: I312a8d2833acc4e89e5974f30e0d8226dafc2642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 14:56:05 +00:00
Snehal Koukuntla
c174f14617
Merge "Add UUIDs to profraw filenames" into main
2023-08-25 14:21:23 +00:00
Treehugger Robot
fa7b5ed0e8
Merge "Increase the number of service supplementary group" into main am: 89b4f96d50
am: 0b3c8ca0b2
am: 12534709d7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727414
Change-Id: Ie9f21b683c67db95427e2a404e5dcf8852d79caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 11:30:20 +00:00
Treehugger Robot
12534709d7
Merge "Increase the number of service supplementary group" into main am: 89b4f96d50
am: 0b3c8ca0b2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727414
Change-Id: I9e546b202b085d641f5f85271d8fe8822c685ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:48:37 +00:00
Treehugger Robot
0b3c8ca0b2
Merge "Increase the number of service supplementary group" into main am: 89b4f96d50
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2727414
Change-Id: Ied5f18880bfdc7cc29a975378e6265df9a598a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 10:05:50 +00:00
Treehugger Robot
89b4f96d50
Merge "Increase the number of service supplementary group" into main
2023-08-25 09:37:25 +00:00
Yinchu Chen
3343ca2380
Increase the number of service supplementary group
...
OEM can add self-owned groups, but the system init cannot support if the group numbers are over than 12, relax some restrictions as appropriate.
Bug: b/296826987
Signed-off-by: Haichao Li <liuhc3@motorola.com>
Change-Id: I231d9f6c82e93c08bc97ca32df70e5b28760acbc
2023-08-25 04:24:48 +00:00
Tomasz Wasilczyk
51115c6d18
Merge "Implement String8|16::empty and String16::length" into main am: 9578c774a9
am: 80738a1e0b
am: 3cca1adac9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705822
Change-Id: I8706d87f07629ff429417eedd97d441593cb2a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:49:51 +00:00
Tomasz Wasilczyk
3cca1adac9
Merge "Implement String8|16::empty and String16::length" into main am: 9578c774a9
am: 80738a1e0b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705822
Change-Id: Idc628dff47b00a0f151c94d011f5ebf18edd6fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 20:09:06 +00:00
Tomasz Wasilczyk
80738a1e0b
Merge "Implement String8|16::empty and String16::length" into main am: 9578c774a9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705822
Change-Id: If14f11f1ec862554e698f443195751b8a997eba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 19:28:24 +00:00
Tomasz Wasilczyk
7d71f24b6b
Merge "Lose convertToResPath to aapt." into main am: 92ad0d32c0
am: 5ba379817d
am: f0ee03c429
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1764798
Change-Id: Ie9694de65dab803d5c53ef05d65087e37786f018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 18:44:42 +00:00
Tomasz Wasilczyk
9578c774a9
Merge "Implement String8|16::empty and String16::length" into main
2023-08-24 18:31:56 +00:00
Tomasz Wasilczyk
f0ee03c429
Merge "Lose convertToResPath to aapt." into main am: 92ad0d32c0
am: 5ba379817d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1764798
Change-Id: I7c2163161a39f4ea3fb805a360ffffeeac7da59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 18:06:36 +00:00
Tomasz Wasilczyk
5ba379817d
Merge "Lose convertToResPath to aapt." into main am: 92ad0d32c0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1764798
Change-Id: I8d3aa01961aae5760f5c476014deeaea516e6bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 17:23:48 +00:00
Tomasz Wasilczyk
92ad0d32c0
Merge "Lose convertToResPath to aapt." into main
2023-08-24 16:46:49 +00:00
Treehugger Robot
e3da38ee3d
Merge "Update bug component from Android Systems to OTA client" into main am: c728c39121
am: 0168cc256a
am: 9ed3caf19f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2719636
Change-Id: I4970d3562098f90a03d529132c1c046bc7ebda43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 12:52:01 +00:00
Treehugger Robot
9ed3caf19f
Merge "Update bug component from Android Systems to OTA client" into main am: c728c39121
am: 0168cc256a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2719636
Change-Id: I09330d23f96fa9d0070ba04d4c114d916194dfeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 12:12:59 +00:00
Treehugger Robot
0168cc256a
Merge "Update bug component from Android Systems to OTA client" into main am: c728c39121
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2719636
Change-Id: I42b8305056a3e9b153b6f8d44808b5dc5092da45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 11:32:12 +00:00
Treehugger Robot
c728c39121
Merge "Update bug component from Android Systems to OTA client" into main
2023-08-24 11:13:12 +00:00
Treehugger Robot
b23651d7f5
Merge "Drop String::empty()" into main am: 47fc3df9a0
am: 68c2432f77
am: 17379e4315
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2707114
Change-Id: I89bd08cebbb0ba7c9938ce79b1eeee120efd9f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 05:42:25 +00:00
Treehugger Robot
17379e4315
Merge "Drop String::empty()" into main am: 47fc3df9a0
am: 68c2432f77
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2707114
Change-Id: Ia6b2958c21692e171d453ee0840af4a9fc1106c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 05:02:52 +00:00
Elliott Hughes
1d98fe0d39
Lose convertToResPath to aapt.
...
aapt (not aapt2) is the only user.
Test: treehugger
Change-Id: Ie69f84f4f805c69f838e345b44755a316b9f9b06
2023-08-24 04:33:05 +00:00
Treehugger Robot
68c2432f77
Merge "Drop String::empty()" into main am: 47fc3df9a0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2707114
Change-Id: If551ac01d8dcfc5862888b561f3a99a01c1f6540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 04:21:44 +00:00
Treehugger Robot
47fc3df9a0
Merge "Drop String::empty()" into main
2023-08-24 03:58:55 +00:00
Daniel Zheng
5196fed4fb
Merge "Add unit test for cow compressor performance" into main am: f278b54731
am: b1cbaa77de
am: fef270e8e6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2722633
Change-Id: Iaa226d2bf8911d363c7efc8f96c16cd4c3785efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 21:54:42 +00:00