Treehugger Robot
5ce89b125b
Merge "init: delay 'user root' test to W+" into main am: 0d8a598b40
am: 848cb39248
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095290
Change-Id: Ib3c54a4b674bd8bff42b31c9c928c0c7137eb834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 16:15:07 +00:00
Treehugger Robot
848cb39248
Merge "init: delay 'user root' test to W+" into main am: 0d8a598b40
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095290
Change-Id: Idbe10b3e4a0229b87853fea4d065fe52231dbdd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 16:05:21 +00:00
Treehugger Robot
0d8a598b40
Merge "init: delay 'user root' test to W+" into main
2024-05-21 15:43:26 +00:00
Android Build Coastguard Worker
1a09a9dbfb
Snap for 11865526 from a0bcbf046c
to 24Q3-release
...
Change-Id: I6f466e1f2e0d8722e8f00719acca66efdf0bba7d
2024-05-21 01:24:44 +00:00
Steven Moreland
a8a2c5a7e1
init: delay 'user root' test to W+
...
We'll make it a build time check in V after this.
Due to being a runtime flog, it was hard to spot and
debug, so delaying.
Bug: 340953047
Test: boot, CtsInitTestCases
Change-Id: Ica1a1c780e230c88615dad7937404d2b0fe9c68f
2024-05-20 22:05:00 +00:00
Maciej Żenczykowski
5e88a32def
make apex init .XXrc parsing honour .35rc even though we're not yet sdk=35
...
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I315cfe77c60988d8cdc8ef64bf8cb2f5c37c93db
2024-05-20 14:25:56 +00:00
Treehugger Robot
a0bcbf046c
Merge "No longer require root for PermissiveMteTest" into main am: e77a69d0b1
am: 426edd8976
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3093159
Change-Id: I012926680ace96b843494ad33f88e9ead23b52cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 13:11:23 +00:00
Treehugger Robot
426edd8976
Merge "No longer require root for PermissiveMteTest" into main am: e77a69d0b1
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3093159
Change-Id: Idda4015bb54c14abe7119018ae0e4b00f110d6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 12:52:45 +00:00
Treehugger Robot
e77a69d0b1
Merge "No longer require root for PermissiveMteTest" into main
2024-05-20 12:41:30 +00:00
Android Build Coastguard Worker
9654b5fae1
Snap for 11859356 from 217e203095
to 24Q3-release
...
Change-Id: If018939be6c0a622658cb1711abf95e7c09c8fe4
2024-05-18 03:24:42 +00:00
Treehugger Robot
217e203095
Merge "Remove stray semicolon." into main am: b9c16a0829
am: b22aab6577
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3094117
Change-Id: I80aaf3a64b2973e19d0b389ff202019fb776a8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 17:29:50 +00:00
Treehugger Robot
b22aab6577
Merge "Remove stray semicolon." into main am: b9c16a0829
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3094117
Change-Id: Idaf0dc4a48af4d580e59f1db93fe42e13684ca94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 17:07:06 +00:00
Snehal
4334a6320c
[Trusty][Metrics] Update struct to add is_crash on the NS side
...
Bug: 340509044
Change-Id: I4547286c5cefa3caaf1bf1c30f205145fb5e689c
2024-05-17 17:01:32 +00:00
Treehugger Robot
b9c16a0829
Merge "Remove stray semicolon." into main
2024-05-17 16:49:29 +00:00
Dennis Shen
76ef5648bf
Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main am: 086371cb49
am: d0ed4346f9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092324
Change-Id: I145cddf08195a724098d556dcb071239bb81b1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 13:59:22 +00:00
Dennis Shen
d0ed4346f9
Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main am: 086371cb49
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092324
Change-Id: I4843dea4b64b3d5b11d1d59bd2187673290e8588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 13:37:20 +00:00
Dennis Shen
086371cb49
Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main
2024-05-17 13:13:28 +00:00
Elliott Hughes
aed74bad41
Remove stray semicolon.
...
Change-Id: Ic50a84888a7e0c059b4c06716e20e5f120b9b343
2024-05-17 11:31:36 +00:00
Treehugger Robot
6b2a919d7d
Merge "cleanup: PLOG(FATAL) crashes, does not need else branch" into main am: 4c3ebe4723
am: fee6d5fdad
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092740
Change-Id: Id4c164133bf157a64dac6a2c7163027fd82d234f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 02:13:46 +00:00
Treehugger Robot
fee6d5fdad
Merge "cleanup: PLOG(FATAL) crashes, does not need else branch" into main am: 4c3ebe4723
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092740
Change-Id: If86da6eaee87768027c3d266447f6b2d2ebec099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-17 01:57:04 +00:00
Treehugger Robot
4c3ebe4723
Merge "cleanup: PLOG(FATAL) crashes, does not need else branch" into main
2024-05-17 01:42:33 +00:00
Android Build Coastguard Worker
908b3bccf2
Snap for 11853201 from ad9922a72b
to 24Q3-release
...
Change-Id: Iac25b6885444501c02577eceaa0974477ebfb669
2024-05-17 01:24:31 +00:00
Dennis Shen
208fccdae8
init.rc: set up init.rc for aconfigd to initialize mainline storage
...
aconfigd-mainline-init is the service target to initialize mainline
storage files. aconfigd is the service target to start aconfigd socket
for incoming messages.
Bug: b/312444587
Test: m and avd
Change-Id: Ic8052eaf933501da3371812c482ad816ec353b27
2024-05-17 00:56:29 +00:00
Treehugger Robot
6037b6ea0f
Merge "Add restorecon flags for force and data data" into main am: be6e1459ee
am: 6f29391e40
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080964
Change-Id: I5113ed4072ecffbff42b17774ffbd0ebc1767054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 23:47:07 +00:00
Treehugger Robot
6f29391e40
Merge "Add restorecon flags for force and data data" into main am: be6e1459ee
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080964
Change-Id: I0a579bcb434bf8b4c581d0d68599b9fc0e39f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 23:35:23 +00:00
Treehugger Robot
5e7e8b189c
Merge "crasher: hide xom from help when unavailable" into main am: 57db6f453c
am: 9d5473637d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092580
Change-Id: I17157dbf1cef82641be54e4459e766c2d3207943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 23:16:36 +00:00
Treehugger Robot
be6e1459ee
Merge "Add restorecon flags for force and data data" into main
2024-05-16 23:15:55 +00:00
Florian Mayer
c4b24f70e6
cleanup: PLOG(FATAL) crashes, does not need else branch
...
Change-Id: I49a439d444dc9f566a05bab23d8cfd06ce56d4a6
2024-05-16 22:59:16 +00:00
Treehugger Robot
9d5473637d
Merge "crasher: hide xom from help when unavailable" into main am: 57db6f453c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3092580
Change-Id: I26090b94fcd705813b26a56e323a24ec0bcd8e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 22:56:48 +00:00
Treehugger Robot
57db6f453c
Merge "crasher: hide xom from help when unavailable" into main
2024-05-16 22:36:33 +00:00
Luzanne Batoon
1ebf9cb663
Add restorecon flags for force and data data
...
Test: m
Bug: 210155681
Change-Id: I9d5b64c48d21e83fb8f03dac261efc530c5f8aa6
2024-05-16 21:35:54 +00:00
Florian Mayer
2df897c1fc
No longer require root for PermissiveMteTest
...
We can now read tombstones as shell user
Change-Id: I2371360e87dc186f37c2d13ebae28b57abe76845
2024-05-16 21:33:51 +00:00
Josh Gao
3a9a989484
crasher: hide xom from help when unavailable
...
Test: m crasher
Change-Id: Iaf25dd650eb5cf6e8b0933f574b3d4a208b74da9
2024-05-16 13:53:02 -07:00
Sijie Chen
ad9922a72b
Merge changes from topic "revert-3081452-revert-3062926-CJGHTRPCBP-GUVWVZQSHP" into main am: 4f88e4b79a
am: 4826151723
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080066
Change-Id: I100f2615cd8641ea3ee35cb34a6742d343cf2d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 16:37:00 +00:00
Sijie Chen
4826151723
Merge changes from topic "revert-3081452-revert-3062926-CJGHTRPCBP-GUVWVZQSHP" into main am: 4f88e4b79a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080066
Change-Id: Ic447425ad46bb3b560941cf035ec07108f3c9a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 16:18:50 +00:00
Sijie Chen
4f88e4b79a
Merge changes from topic "revert-3081452-revert-3062926-CJGHTRPCBP-GUVWVZQSHP" into main
...
* changes:
Reland "[Berberis][CrashReporting] Dump guest thread inf..."
Reland "[Berberis][CrashReporting] Extend ThreadInfo to ..."
2024-05-16 16:04:47 +00:00
Ryan Prichard
7246fac348
Merge "Define String8 and String16 operator<=>" into main am: c97381bf01
am: 449c8f1881
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3081027
Change-Id: Ie7e0ef9daecc1f7004631bb876d862bbb8584aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 04:14:11 +00:00
Treehugger Robot
2e70ab81f3
Merge "libstatssocket_lazy: add isAvailable()" into main am: e0ca67f286
am: 8a36ea617e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3084108
Change-Id: I33945a2407d3f9967cb8bf89771a5558c230cd92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 04:13:50 +00:00
Ryan Prichard
449c8f1881
Merge "Define String8 and String16 operator<=>" into main am: c97381bf01
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3081027
Change-Id: I1d86ec2f7d2c68afa83c795d43934c11beba8ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 03:54:21 +00:00
Treehugger Robot
8a36ea617e
Merge "libstatssocket_lazy: add isAvailable()" into main am: e0ca67f286
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3084108
Change-Id: I301790b27ccb3a745bfb6af69712d371ec0bfa2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 03:54:00 +00:00
Ryan Prichard
c97381bf01
Merge "Define String8 and String16 operator<=>" into main
2024-05-16 03:45:15 +00:00
Treehugger Robot
e0ca67f286
Merge "libstatssocket_lazy: add isAvailable()" into main
2024-05-16 03:40:46 +00:00
Jooyung Han
ec54595aff
libstatssocket_lazy: add isAvailable()
...
Early processes might not have access to libstatssocket. They should be
able to check before using libstatssocket APIs. Adding isAvailable().
Bug: 281162849
Test: atest libstatssocket_lazy_test
Test: atest StagedRollbackTest
Change-Id: Ie2a851ef5bcf4fe081898153d688a843d8886788
2024-05-16 10:57:59 +09:00
Android Build Coastguard Worker
e58d5d6e0c
Snap for 11847214 from d53ee5ab9c
to 24Q3-release
...
Change-Id: I1ee3a8a131b262c1b3ea89e200b1594871d2f507
2024-05-16 01:25:14 +00:00
Steven Moreland
909107b0be
Merge "16k kernel dev option changes ro.build.fingerprint" into main am: bf7e0df4d6
am: b1f216255c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3090045
Change-Id: I6507f8e6f1404e8642c3ffbb0cf799f4871f66d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 01:14:02 +00:00
Steven Moreland
b1f216255c
Merge "16k kernel dev option changes ro.build.fingerprint" into main am: bf7e0df4d6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3090045
Change-Id: Ia837f5efa1e89cd484db8940b88eabcca8780ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-16 00:58:44 +00:00
Steven Moreland
bf7e0df4d6
Merge "16k kernel dev option changes ro.build.fingerprint" into main
2024-05-16 00:44:41 +00:00
Ryan Prichard
f01048743a
Define String8 and String16 operator<=>
...
Previously, in C++20 mode, using <=> on String8 or String16 would
compare the pointer values from the implicit conversion operators
returning const char* and const char16_t*. Instead, compare the string
content. This is especially a problem with STL containers that prefer
<=> when it is available.
See https://godbolt.org/z/cc1hW17h3 for a demo of the problem.
Bug: 339775405
Test: treehugger
Change-Id: I5ee6af96dee0c9968a1bab1ad96729e45bb1ac50
2024-05-15 17:34:57 -07:00
Steven Moreland
188d59a919
16k kernel dev option changes ro.build.fingerprint
...
When someone uses the 16kb dev option, they switch
out the kernel, but the same build is used. Make
sure this is visible in the fingerprint to help
split up any analytics or reports.
Bug: 332406754
Test: no change on normal device, on 16k dev option device:
:) adb shell getprop ro.product.build.16k_page.enabled
true
:) adb shell getconf PAGE_SIZE
16384
:) adb shell getprop ro.build.fingerprint
generic/aosp_cf_x86_64_phone_pgagnostic_16kb/vsoc_x86_64_pgagnostic:VanillaIceCream/MAIN.b7aab5e4/eng.smorel.20240514.203625:userdebug/test-keys
^^^^^^
----------------------------/
cheers
Change-Id: I9632237cef4a3b077761022eda8cf42784a41753
2024-05-15 20:18:51 +00:00
Florian Mayer
d53ee5ab9c
Merge "Prevent mte_upgrade_test from hanging if MTE is disabled" into main am: 53748d08e5
am: 6654e8f2d0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3086860
Change-Id: I2fa3788cc92a227a66b24522c11b90544dbfadc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-15 18:33:43 +00:00