Commit graph

75249 commits

Author SHA1 Message Date
Automerger Merge Worker
f4de051cf3 Merge "[automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours" into android12-tests-dev am: f4a0358ad9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: I2d1066a354544169682d4bb104d0fb269768246c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:52:18 +00:00
Treehugger Robot
d404d92ae5 [automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours am: 6033c0d965 -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268

Change-Id: Ie20677cfa65ab6c79b8dce519d7b99c44c2b6ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:52:17 +00:00
Automerger Merge Worker
aac335af08 Merge changes from topic "am-468cea9b039c4e73b38044a2424a425a" into android12L-tests-dev
* changes:
  Merge "[automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours" into android12-tests-dev am: 99a5f9a68b
  [automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours am: 3ff0b1b643 -s ours
2022-04-21 00:52:02 +00:00
Automerger Merge Worker
6c51da86b5 Merge "[automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours" into android12-tests-dev am: 99a5f9a68b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: I1bf7a3b11ed2ced8d529fc23945e62fd9e556f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:51:58 +00:00
Treehugger Robot
797bd92ef4 [automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours am: 3ff0b1b643 -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1844795

Change-Id: I48d5f2e6c719becb87e174b21602b653401cfa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:51:57 +00:00
Automerger Merge Worker
c1a6b27d21 Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38" into android12L-tests-dev 2022-04-21 00:51:48 +00:00
Automerger Merge Worker
6a5ac60cce Merge "Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: I839da4bee076444d4e679a26c0bec7e0ea74890a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:51:47 +00:00
Automerger Merge Worker
865187fd2c Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev
* changes:
  Merge changes from topic "am-2836a4d711754834abedc83f98b2abed" into android12-tests-dev am: 53542c3757
  [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours
2022-04-21 00:51:36 +00:00
Automerger Merge Worker
bb7c067994 Merge changes from topic "am-2836a4d711754834abedc83f98b2abed" into android12-tests-dev am: 53542c3757
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: Idb3cb13dca6048ddf3513a6c844692000892b60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:51:32 +00:00
Treehugger Robot
6b79f7df2e [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours
am skip reason: skipped by user karthikmr

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535382

Change-Id: I6bf7dbe3bde1ced95a10095ee8b8afb9cc80851c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:51:30 +00:00
Automerger Merge Worker
fb3c951f11 Merge changes from topic "am-688679ebddb9459590f4ede853e36462" into android12L-tests-dev
* changes:
  Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours
  [automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours am: ca3aa04b1b -s ours
2022-04-21 00:50:39 +00:00
Automerger Merge Worker
aa6d2eacf4 Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: I534a29b1f75233c78af0563b1caebb38c98c9fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:50:34 +00:00
Automerger Merge Worker
8b84b19363 [automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours am: ca3aa04b1b -s ours
am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665

Change-Id: I60af1543461fa7debbcb1de4651b14ace0f10edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:50:32 +00:00
Automerger Merge Worker
096a880fc7 Merge changes from topic "am-8485851bde534ba18259034d03754b06" into android12L-tests-dev
* changes:
  Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours
  Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours am: 3b645155e6 -s ours
2022-04-21 00:50:15 +00:00
Automerger Merge Worker
8b69af92f9 Merge "Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours" into android12-tests-dev am: 4ffcef6ce7 -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 019f731097 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: I1a998e3a3ce3f7a0017acbe5f0824c03e82f2765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:50:13 +00:00
Automerger Merge Worker
a08a769bad Merge "[automerger skipped] Merge "Restore fastboot delete-logical-partition command for VTS" into android10-tests-dev am: 2c8ca771e7 -s ours" into android11-tests-dev am: 6d0ec70e01 -s ours am: 3b645155e6 -s ours
am skip reason: Merged-In I00366b281eafa5677b0941419a86f2702fb3484b with SHA-1 019f731097 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1258132

Change-Id: I7b9e23329f24b2e2b26e1a628b3b2ed8dad5c2ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:50:12 +00:00
Automerger Merge Worker
e5fdc5a93b Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev
* changes:
  Merge changes from topic "am-7dbf291131af44a2ba18c9e135092781" into android12-tests-dev am: 80adc5a733
  [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours am: c422e0a592 -s ours
2022-04-21 00:49:54 +00:00
Automerger Merge Worker
d7e97adbb6 Merge changes from topic "am-7dbf291131af44a2ba18c9e135092781" into android12-tests-dev am: 80adc5a733
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I5361b8f6428f649c6e37de1d8bdbeddc8aa7da08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:51 +00:00
Treehugger Robot
5a3f06cb8b [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours am: c422e0a592 -s ours
am skip reason: skipped by user dmulabagal

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888

Change-Id: I0db8fc6b7a84a9cbfa8b4a0b1ab5f5c24ed8b427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:50 +00:00
Automerger Merge Worker
b4287bf117 Merge changes from topic "am-3afb14f2ca7649c780c6884f53a799b4" into android12L-tests-dev
* changes:
  Merge changes from topic "am-9099d682e3ba4a988431510855241774" into android12-tests-dev am: 191e93d403
  [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours am: 350698a44c -s ours am: 759ae1ffcc -s ours
2022-04-21 00:49:38 +00:00
Automerger Merge Worker
5d5c00571e Merge changes from topic "am-9099d682e3ba4a988431510855241774" into android12-tests-dev am: 191e93d403
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: Iaaabc109dc89bb8b99d391ff427d979fb5b1960c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:35 +00:00
Treehugger Robot
afbf9f72b5 [automerger skipped] Merge "Allow fuzzy_fastboot test devices over internet" into android10-tests-dev am: ea5c4aa4e6 -s ours am: 350698a44c -s ours am: 759ae1ffcc -s ours
am skip reason: skipped by user agowdra

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1168004

Change-Id: If46801c1c8d7b2f4126b2c43d9ad90a8dd24f043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:34 +00:00
Automerger Merge Worker
fd515cbdfd Merge changes from topic "am-32562e4e7a11481995df723a3616eb3d" into android12L-tests-dev
* changes:
  Merge changes from topic "am-abd98aeb0e0a4e1bb1c8f1becae1dd08" into android12-tests-dev am: 22026beaab
  [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours am: a5cdf4bdae -s ours
2022-04-21 00:49:24 +00:00
Automerger Merge Worker
5579a30048 Merge changes from topic "am-abd98aeb0e0a4e1bb1c8f1becae1dd08" into android12-tests-dev am: 22026beaab
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: Ifcf90ad19edb3470473ba4f9b2e9f951580e10bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:21 +00:00
Treehugger Robot
8dabf09a22 [automerger skipped] Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" into android10-tests-dev am: db5c1bc4ab -s ours am: cc1a7a2abb -s ours am: a5cdf4bdae -s ours
am skip reason: skipped by user trong

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1201445

Change-Id: Ifb1dcf6f798f677d3515dac71ff83de0f017f7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:19 +00:00
Automerger Merge Worker
142b07c4c0 Merge changes from topic "am-d53d0500e829445dade5c7974fab4e25" into android12L-tests-dev
* changes:
  Merge changes from topic "am-51ac8ff0e5ff4716aa187d26a93441df" into android12-tests-dev am: fe72948400
  [automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours am: a26b9ad1bd -s ours am: 2406c3cde1 -s ours
2022-04-21 00:49:09 +00:00
Automerger Merge Worker
f418fe570a Merge changes from topic "am-51ac8ff0e5ff4716aa187d26a93441df" into android12-tests-dev am: fe72948400
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: I1d9d3f3ca36b93a6c45c23212ea572db6c9c919a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:06 +00:00
Treehugger Robot
56b51d35a2 [automerger skipped] Merge "Fiemap tests should only run on API level >= 29." into android10-tests-dev am: dd948046ab -s ours am: a26b9ad1bd -s ours am: 2406c3cde1 -s ours
am skip reason: skipped by user dvander

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1150077

Change-Id: I872517a7f6207ad1daeea0023ddc951f990d710b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:49:05 +00:00
Automerger Merge Worker
def183bea7 Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev
* changes:
  Merge changes from topic "am-042a54b58d7f4baaa228e143642973ff" into android12-tests-dev am: de254ffc1a
  [automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours am: 2b889498a2 -s ours am: c18b24e749 -s ours
2022-04-21 00:48:51 +00:00
Automerger Merge Worker
9df2494a29 Merge changes from topic "am-042a54b58d7f4baaa228e143642973ff" into android12-tests-dev am: de254ffc1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I8e9a5e0aadd88f61240357c05a4fc258228ff107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:48:48 +00:00
Treehugger Robot
75792a6ec3 [automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours am: 2b889498a2 -s ours am: c18b24e749 -s ours
am skip reason: skipped by user robinjacob

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1146576

Change-Id: I851468a7b18906b2ad609d6d022c72f0c4619250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:48:45 +00:00
Treehugger Robot
abed76bf3e Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev 2022-04-21 00:33:02 +00:00
Christopher Ferris
ff331cf38c Merge "Update for SetProcessMemory removal." 2022-04-20 23:49:06 +00:00
Treehugger Robot
2d0decdc85 Merge "Fix: null name is added when using android_set_process_profiles" 2022-04-20 20:45:18 +00:00
Jiyong Park
cc9932b291 Fix: null name is added when using android_set_process_profiles
This CL fixes a bug that null names are passed when profiles are set
via android_set_process_profiles. This is because the `profiles_` vector
was initialized with the number of task profiles and then we append the
actual task profile names to the vector. As a result, when {"a", "b"}
was given, the vector ended up having {"", "", "a", "b"}. Fixing this by
correctly using reserve().

Bug: N/A
Test: m
Change-Id: I28d6c2e891b01a2d3a8a88d9d0652fe0dbffac96
2022-04-20 17:11:42 +09:00
Christopher Ferris
c6d428343c Update for SetProcessMemory removal.
Bug: 120606663

Test: All unit tests pass.
Change-Id: Icf8a3ceb75b8962f8f215501c2bac631b40a1527
2022-04-19 22:06:58 -07:00
Chris Wailes
96c9b1f423 Fix lints from Rust 1.60.0
Bug: 222737227
Test: m rust
Change-Id: Idd2c37516565950d82781b5cb05095548368d5fd
2022-04-19 17:25:32 -07:00
Rick Yiu
a18660fb82 Merge "Add profile for VM compilation" 2022-04-20 00:12:59 +00:00
Rick Yiu
a38d83440a Add profile for VM compilation
Add VMCompilationPerformance.

Bug: 223790172
Test: build pass
Change-Id: I27b939ddee4b039ba3037195a4f23c823bf9c8ff
2022-04-19 14:27:48 +08:00
David Anderson
891ba3a587 vts_libsnapshot_test: Fix free space calculation.
This should be using unreserved free space, not total free space.

Bug: 223701928
Test: vts_libsnapshot_test
Change-Id: Ic0a657fe094b57734c93958d7e5da56fbfbada7f
(cherry picked from commit 15433b93ff)
2022-04-19 01:26:19 +00:00
Florian Mayer
ee711eda88 Merge "Add hwasan presubmit for debuggerd." 2022-04-19 00:08:33 +00:00
Treehugger Robot
0f2cc4e4d4 Merge "Adding trong@google.com as fuzzer owner for trusty fuzzers" 2022-04-18 23:09:18 +00:00
Anis Assi
5f43e61fef Adding trong@google.com as fuzzer owner for trusty fuzzers
Bug: 221891733
Change-Id: I41895ffbd6d65f9f3de90088c5f0b9ba2f3210d4
2022-04-18 20:42:10 +00:00
Florian Mayer
378969f949 Add hwasan presubmit for debuggerd.
Change-Id: Ic6b27b89470f4e8fb21dd29f8a8f486b528bdedc
2022-04-18 20:27:52 +00:00
Jiyong Park
5590e1152e Merge changes from topic "task_profile_crosvm"
* changes:
  Virtualizationservice is owned by the system UID
  /dev/[kvm|vhost-vsock] are owned by system
2022-04-18 16:38:29 +00:00
Bowgo Tsai
243df2d917 Merge "fs_mgr: Don't assume partitions replaced by DSU are logical already" 2022-04-18 09:39:25 +00:00
Tim Zimmermann
496132bc99 fs_mgr: Don't assume partitions replaced by DSU are logical already
Test: Boot DSU on a device without dynamic partitions but first_stage_mount for /system

Change-Id: I07f0f40037109aaaf1bce0151d1eac26c971ba9e
2022-04-17 08:22:34 +02:00
Akilesh Kailash
e3cca4a0d1 Merge "libsnapshot: Remove invalid snapshot metadata" 2022-04-16 22:55:56 +00:00
Akilesh Kailash
f86fca236f libsnapshot: Remove invalid snapshot metadata
If there are snapshot metadata persisting in /metadata/ota/snapshots,
remove them before applying a new update. Make sure that
the snapshots are indeed invalid before removing them.

On a sidenote, add a comment in init.cpp related to
b/223076262.

Bug: 228250473
Test: 1: Apply OTA in recovery through adb sideload
2: Reboot
3: Apply OTA OTA again through update_device.py
4: Re-run Full OTA updates just from update_device.py

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I116bbafae09042b9c391ccd58c102704571c214e
2022-04-16 16:43:35 +00:00
Florian Mayer
4691a163c1 Merge "Skip debuggerd tests that do not apply to HWASan." 2022-04-16 06:03:38 +00:00