Xin Li
b33d73e643
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2f5e50cfd0
-s ours am: 6be3bcb5bb
-s ours
...
am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7ff
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699
Change-Id: I92729e360d21adce61d9dd64d450353cb5fcd372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:10:31 +00:00
Xin Li
6be3bcb5bb
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 2f5e50cfd0
-s ours
...
am skip reason: Merged-In I4955367085f3f7c829b8b4e7b06aafaaac9ad748 with SHA-1 7131b6c7ff
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2992699
Change-Id: Icb3def6d6621136bc6a49adb22ddf6908382b696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 08:33:31 +00:00
Michael Hoisie
6299508238
Merge "Remove the redundant libcutils_sockets_test" into main am: 1140355bde
am: 42061e923a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2991012
Change-Id: Iff50b758f9c10daf81d9a2d27d6c08f319131080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 07:30:33 +00:00
Michael Hoisie
42061e923a
Merge "Remove the redundant libcutils_sockets_test" into main am: 1140355bde
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2991012
Change-Id: I97e8e58001bf4855040e0cec8356e0fa172b301b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 06:50:58 +00:00
Michael Hoisie
1140355bde
Merge "Remove the redundant libcutils_sockets_test" into main
2024-03-07 06:01:19 +00:00
Treehugger Robot
070433bb80
Merge "Skip initializing ro.vendor.api_level if already defined" into main am: 6c6b9e33d6
am: 097b46e454
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2981775
Change-Id: I4824bcb79e0a788803efab6fc6e75734e5fbfeec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 04:55:29 +00:00
Treehugger Robot
097b46e454
Merge "Skip initializing ro.vendor.api_level if already defined" into main am: 6c6b9e33d6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2981775
Change-Id: I91f60d742914d046c71acfeaa9a9c1a0d6682971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 04:13:15 +00:00
Treehugger Robot
6c6b9e33d6
Merge "Skip initializing ro.vendor.api_level if already defined" into main
2024-03-07 03:42:14 +00:00
Xin Li
2f5e50cfd0
Merge Android 14 QPR2 to AOSP main
...
Bug: 319669529
Merged-In: I4955367085f3f7c829b8b4e7b06aafaaac9ad748
Change-Id: Idefdb54491ebf42c4d8a04ddcc71fa87f500b79e
2024-03-06 18:58:28 -08:00
Michael Hoisie
d1e4c263c4
Remove the redundant libcutils_sockets_test
...
'sockets_test.cpp' also runs as part of libcutils_test and
libcutils_static_test, so it is redundant to have it be a separate
target.
Test: libcutils_test
Test: libcutils_static_test
Bug: 317884162
Change-Id: Ib2c2f74feb79d1436ca67ae9aca18d3eb7acf5a0
2024-03-06 22:18:58 +00:00
Treehugger Robot
ca19f87f8c
Merge "Create /mnt/pre_reboot_dexopt on init for Pre-reboot Dexopt." into main am: 59d9dc1f50
am: ce2e4b52b9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2983612
Change-Id: I3aadc472ad5e135cd6ca5e2193d989e777c430f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 13:49:59 +00:00
Treehugger Robot
ce2e4b52b9
Merge "Create /mnt/pre_reboot_dexopt on init for Pre-reboot Dexopt." into main am: 59d9dc1f50
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2983612
Change-Id: I1d0052958a5e6436ae3d494cf2ccd59a11babe73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 13:08:51 +00:00
Treehugger Robot
59d9dc1f50
Merge "Create /mnt/pre_reboot_dexopt on init for Pre-reboot Dexopt." into main
2024-03-06 12:27:27 +00:00
Justin Yun
4058ba29b5
Skip initializing ro.vendor.api_level if already defined
...
Devices may predefine ro.vendor.api_level. Skip calculating the value
if the ro.vendor.api_level is already defined.
Bug: 326164316
Test: getprop ro.vendor.api_level
Change-Id: Ic9fd2a0eef6ba9345f98a5cb1eb790080e19ca19
2024-03-06 18:28:58 +09:00
Treehugger Robot
267e3c74ee
Merge "Revert^2 "Add TEST_MAPPING for debuggerd CTS"" into main am: 98c2d78b4f
am: 7131b6c7ff
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984645
Change-Id: Icb1ba7b0baf2772c29ab4d32385718709ce0200b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 20:20:32 +00:00
Treehugger Robot
7131b6c7ff
Merge "Revert^2 "Add TEST_MAPPING for debuggerd CTS"" into main am: 98c2d78b4f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984645
Change-Id: I4955367085f3f7c829b8b4e7b06aafaaac9ad748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 19:38:19 +00:00
Treehugger Robot
98c2d78b4f
Merge "Revert^2 "Add TEST_MAPPING for debuggerd CTS"" into main
2024-03-05 18:55:59 +00:00
Hsin-Yi Chen
511c94f43b
Merge "Annotate LLNDK functions in non-vendor libraries" into main am: d0e8eab404
am: ec15e9247b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2988249
Change-Id: I18cafbfcf0f39af3bac3ef2e89c6960ab42e0757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 12:25:50 +00:00
Hsin-Yi Chen
ec15e9247b
Merge "Annotate LLNDK functions in non-vendor libraries" into main am: d0e8eab404
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2988249
Change-Id: I4519224a11c8a1e87a3744f7c34c10b5db442fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 11:43:52 +00:00
Hsin-Yi Chen
d0e8eab404
Merge "Annotate LLNDK functions in non-vendor libraries" into main
2024-03-05 10:57:40 +00:00
Hsin-Yi Chen
80dca7ba59
Annotate LLNDK functions in non-vendor libraries
...
The ABI tool analyzes the source code of LLNDK libraries. It compiles
the source with the flags for core variants where __INTRODUCED_IN_LLNDK
does not version the API. To expose the version information to the ABI
tool, __INTRODUCED_IN_LLNDK is defined as an "annotate" attribute in
core variants.
Test: make
Bug: 314010764
Change-Id: I798a397f0e7567ca54db5e4aff4235933ebd3943
2024-03-05 09:18:39 +00:00
Florian Mayer
b23b8ff64d
Merge "Add test for invalid setjmp in MTE" into main am: 851c857420
am: 10640bf995
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982907
Change-Id: Ib1badd4c12b1ac92c28f5b41ea676fedbe05000a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 02:54:03 +00:00
Florian Mayer
10640bf995
Merge "Add test for invalid setjmp in MTE" into main am: 851c857420
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982907
Change-Id: Ic78dc82161b7ccc27a1ed5fc7ec74281b3d90343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-05 02:11:50 +00:00
Florian Mayer
851c857420
Merge "Add test for invalid setjmp in MTE" into main
2024-03-05 01:33:03 +00:00
Florian Mayer
e6462f91c2
Add test for invalid setjmp in MTE
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=man is for manpage
Test: atest debuggerd_test
Change-Id: I774095b79baadb4f692f4b97b47df80e635e3a1c
2024-03-04 12:17:19 -08:00
Kelvin Zhang
bc2733b404
Merge "Add annotations to VTS tests" into main am: eed1c42087
am: db71f06e34
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984641
Change-Id: I1277e76aa17522d1cb20a19f6efffb84a1b0e3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-01 03:25:13 +00:00
Treehugger Robot
f3bc86220d
Merge "debuggerd_test: fix invalid regexs" into main am: 562f953acd
am: e73c39f8eb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984642
Change-Id: I2fe29e388878c28b1526a4f0155202766a43d398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-01 03:24:47 +00:00
Kelvin Zhang
db71f06e34
Merge "Add annotations to VTS tests" into main am: eed1c42087
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984641
Change-Id: Ic0d5eb3803ff03bed830a691fc86638d5ab2122a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-01 02:44:17 +00:00
Treehugger Robot
e73c39f8eb
Merge "debuggerd_test: fix invalid regexs" into main am: 562f953acd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984642
Change-Id: Ic245f648c8b4b41ce50263bad6a8c977b155fcc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-01 02:44:06 +00:00
Kelvin Zhang
eed1c42087
Merge "Add annotations to VTS tests" into main
2024-03-01 02:35:40 +00:00
Treehugger Robot
562f953acd
Merge "debuggerd_test: fix invalid regexs" into main
2024-03-01 01:54:51 +00:00
Florian Mayer
b7e9941744
Revert^2 "Add TEST_MAPPING for debuggerd CTS"
...
This reverts commit aa48834485
.
Reason for revert: fixed in https://r.android.com/2985051
Change-Id: I76a53df9fb585d90778019e74472ad294963a91c
2024-03-01 01:52:23 +00:00
Florian Mayer
88d70a5a38
Merge "Revert "Add TEST_MAPPING for debuggerd CTS"" into main am: f8a75c9e53
am: 6639147c4b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984791
Change-Id: I084db976560051db8c75e41f35cfe001b77c3d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-01 00:33:00 +00:00
Florian Mayer
6639147c4b
Merge "Revert "Add TEST_MAPPING for debuggerd CTS"" into main am: f8a75c9e53
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984791
Change-Id: I834c37dd124a05cdb3e9a9484373494149e21df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 23:51:33 +00:00
Florian Mayer
f8a75c9e53
Merge "Revert "Add TEST_MAPPING for debuggerd CTS"" into main
2024-02-29 23:02:51 +00:00
Ryan Prichard
bc227038c0
debuggerd_test: fix invalid regexs
...
\(fault address prefixed with --->)
should be
\(fault address prefixed with --->\)
Test: debuggerd_test
Bug: 175635923
Bug: 327668317
Change-Id: I03bf8969e9818956ae79b916ab852efaf4f2f78a
2024-02-29 14:40:57 -08:00
Kelvin Zhang
98522c0e2d
Add annotations to VTS tests
...
This helps reviewers understand which VTS requirement these test are
covering
Bug: 302208814
Test: th
Change-Id: I52712d9888b73fc7a9f8eeeb035a3303618efd69
2024-02-29 14:30:35 -08:00
Jiakai Zhang
699f27913f
Create /mnt/pre_reboot_dexopt on init for Pre-reboot Dexopt.
...
Bug: 311377497
Test: manual - Boot the device and see the directory.
Change-Id: I083e0dc3c8d16839122a42fc3d00cdcac07a5cb8
2024-02-29 21:41:41 +00:00
Treehugger Robot
3dca3b05b7
Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main am: b6fc19c308
am: b1aa489b06
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984453
Change-Id: I4d03d9dfec57b537ddcc18d01d39d285854f3d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 18:26:41 +00:00
Treehugger Robot
b1aa489b06
Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main am: b6fc19c308
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2984453
Change-Id: Ie2d930c3d29e3e6f9c65a979649a7c73b5746329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 17:45:29 +00:00
Treehugger Robot
b6fc19c308
Merge "adb-remount-test: Adb shell command could return 0 or 255 if device is disconnected" into main
2024-02-29 16:59:14 +00:00
Oluwarotimi Adesina
aa48834485
Revert "Add TEST_MAPPING for debuggerd CTS"
...
This reverts commit d059478ee1
.
Reason for revert: Potential culprit for b/327525776- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I4b713aa46b2869a677a210cfce6ae880366b045e
2024-02-29 15:10:09 +00:00
Yi-Yo Chiang
2f298bcb21
adb-remount-test: Adb shell command could return 0 or 255 if device is
...
disconnected
Background: aosp/I25f740bd222263fcb3c501def38977db6af1e0d9
Bug: 327552188
Test: abtd
Change-Id: Ida33bfa00887e8ac358e057fc37fd45095ccc26b
2024-02-29 19:45:14 +08:00
Akilesh Kailash
6e32e79fc8
Merge "Reapply "snapshotctl: Add apply-update option"" into main am: 3aef00da3d
am: 23c658aa3a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982153
Change-Id: I41a464c8666e37e1c608b58a95e5424bc84408e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 07:54:34 +00:00
Akilesh Kailash
23c658aa3a
Merge "Reapply "snapshotctl: Add apply-update option"" into main am: 3aef00da3d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982153
Change-Id: Ia7d40f392e5587372452fee65e03ada30b19f8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 07:13:21 +00:00
Akilesh Kailash
3aef00da3d
Merge "Reapply "snapshotctl: Add apply-update option"" into main
2024-02-29 06:27:11 +00:00
Florian Mayer
1e9735ada7
Merge "Add TEST_MAPPING for debuggerd CTS" into main am: d685442133
am: 190c6a96d7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982892
Change-Id: I78da7a4b94e75047fe39d87e1c28509eecd8d0f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 03:53:18 +00:00
Florian Mayer
190c6a96d7
Merge "Add TEST_MAPPING for debuggerd CTS" into main am: d685442133
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982892
Change-Id: I5c9854591abd654853a45ecd0a481997e6c0ebf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 03:11:27 +00:00
Florian Mayer
d685442133
Merge "Add TEST_MAPPING for debuggerd CTS" into main
2024-02-29 02:29:09 +00:00
Treehugger Robot
300a20ab80
Merge "aconfig_storage: fix aconfig storage dir permissions" into main am: 87e978bc47
am: b14976ab85
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2982792
Change-Id: Ic5fecc876aba3a30caa0ecc023e763def3237cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 02:26:26 +00:00