Commit graph

81664 commits

Author SHA1 Message Date
Automerger Merge Worker
2520bfb0d9 Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev 2023-06-07 22:18:20 +00:00
Automerger Merge Worker
b30ffaea19 Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: Ia1640c6f62b2c3260620a775a439e5dbd715c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 22:18:18 +00:00
Automerger Merge Worker
50cac03f37 Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev 2023-06-07 21:59:14 +00:00
Treehugger Robot
0b3153f9c0 Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: I80baf972eba778b21195028782a2cf63fc7b85f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 21:59:11 +00:00
Treehugger Robot
9825551dbf Merge "libcutils_test: static libjsoncpp" into android12-tests-dev 2023-06-07 21:25:59 +00:00
David Anderson
f300a2bc08 Merge changes Ie2f531bd,I7e418ffe am: aa45319453
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2585085

Change-Id: I2fb68a9aed35ae7241bc152d7563e0f0ef4756ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 15:53:04 +00:00
David Anderson
aa45319453 Merge changes Ie2f531bd,I7e418ffe
* changes:
  libsnapshot: Remove OnlineKernelSnapshotWriter.
  libsnapshot: Remove unused SupportsCopyOperation.
2023-06-07 15:20:11 +00:00
David Anderson
aecdb290ca Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." am: 8aee6d4a41
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617814

Change-Id: I397f8400e1cfffb5b91c85cad94acb3cc5ca71b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 04:37:33 +00:00
David Anderson
8aee6d4a41 Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." 2023-06-07 04:10:26 +00:00
David Anderson
084c94e43e vts_fs_test: Relax filesystem constraints for fixed partitions.
Adjust this test to align with VSR. First, skip the test if kernel is
< 5.10 or < Android 13. Second, allow non-dynamic partitions to be vfat.

Bug: 286038059
Test: vts_fs_test on CF
Change-Id: I5bd874f68296f7155d8c4366ebc13fe3d59c3ee6
2023-06-06 16:46:21 -07:00
David Anderson
6157161b7f Merge changes Ibc0f9818,I29b5617e am: 82804e5dd0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2576678

Change-Id: I254532399562158552875674877078c5d20168fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 23:38:42 +00:00
David Anderson
82804e5dd0 Merge changes Ibc0f9818,I29b5617e
* changes:
  libsnapshot: Reject bad cow versions.
  libsnapshot: Split CowReader into CowParserV2.
2023-06-06 22:59:01 +00:00
Steven Moreland
5aaff3472b Merge "libcutils_test: static libjsoncpp" am: 7681f71b43
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617474

Change-Id: I5eab6caa0b1f837bd46c8faf67462673f510d9e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 22:13:48 +00:00
Steven Moreland
7681f71b43 Merge "libcutils_test: static libjsoncpp" 2023-06-06 21:34:44 +00:00
Eric Biggers
e2c64f77c1 Merge "fs_mgr_fstab: allow fileencryption without equals sign" am: b9be43ae5c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2615729

Change-Id: I2e121557846f458e9dea6ce69dcc6f44dd1ac71a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 20:26:25 +00:00
Eric Biggers
b9be43ae5c Merge "fs_mgr_fstab: allow fileencryption without equals sign" 2023-06-06 19:43:49 +00:00
David Anderson
c5d29136da Merge "Move ENOSPC tests to libfiemap." am: 3a079130de
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2616409

Change-Id: I7a98814033fc48b58c95da71fb9bff5752bec124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 19:08:23 +00:00
David Anderson
3a079130de Merge "Move ENOSPC tests to libfiemap." 2023-06-06 18:19:51 +00:00
Daniel Zheng
e8bea3dd2a Merge "Adding GetInfo method for tasks" am: 95303da18e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2615737

Change-Id: Iefc4fe53504631cf47d0f34322a23f3ea9cdb5b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 18:00:38 +00:00
Steven Moreland
447b4a4bf0 libcutils_test: static libjsoncpp
The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.

We should probably collapse libcutils_test with
libcutils_test_static in the future.

Bug: 285357054
Test: libcutils_test
Merged-In: Ic84901ce5af766338b2cab07c3cf10841ba9a150
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
2023-06-06 17:54:52 +00:00
Steven Moreland
40b59a61fc libcutils_test: static libjsoncpp
The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.

We should probably collapse libcutils_test with
libcutils_test_static in the future.

Bug: 285357054
Test: libcutils_test
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
2023-06-06 17:52:39 +00:00
Daniel Zheng
95303da18e Merge "Adding GetInfo method for tasks" 2023-06-06 17:16:35 +00:00
Treehugger Robot
410ec83478 Merge "Add the Missing Header" am: 20db4e3d17
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2616170

Change-Id: Ic467fd7d07467a4ab14a7a78af9c2bbd98fec1d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 23:40:33 +00:00
Treehugger Robot
20db4e3d17 Merge "Add the Missing Header" 2023-06-05 22:43:11 +00:00
David Anderson
6cef6905d7 Move ENOSPC tests to libfiemap.
These tests are still giving us trouble. Move them to libfiemap, which
(1) is closer to the source of implementation, and (2) allows us to
re-use the temporary filesystem code. This won't perturb the state of
the actual device.

The new test creates a 64MB ext4 or f2fs mount point as a sandbox, which
should be much safer.

Bug: 285197715
Test: fiemap_writer_test
Change-Id: I33502d49613be4f269a80e5c632514fc56a0246a
2023-06-05 15:06:29 -07:00
Daniel Zheng
665a460e8a Adding GetInfo method for tasks
Using for easier debugging. Replacing old getter methods in flash task
with GetInfo(key)

Test: fastboot_test
Change-Id: If42df86c4b0278c3dc5525b1058f1947f0b34794
2023-06-05 14:40:50 -07:00
Edward Liaw
a199dcdedd Merge "KernelLibcutilsTest: change test file push location" am: da739b2eea
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2611426

Change-Id: Ief2dbba871352309637731bb045d5bad8af79edb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:25:49 +00:00
Daniel Zheng
3c828ed528 Merge "Adding in wipe tasks before other tasks run." am: 819a3529b5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2615736

Change-Id: I6e1701152918b2f0136126da24c46071bb17a5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 21:25:01 +00:00
Hao Chen
b3e1993ee5 Add the Missing Header
`stderror` is used in this file and it is defined in `string.h/cstring`, so
the header file needs to be directly included.

Test: build
Bug: 285204695
Change-Id: Idf34126626ad0e9bb397df3d5da50439bf18381d
2023-06-05 13:49:17 -07:00
Edward Liaw
da739b2eea Merge "KernelLibcutilsTest: change test file push location" 2023-06-05 20:19:09 +00:00
David Anderson
07533c520c init: Fix ramdump when enabling shutdown animations.
Fix a bug where services weren't stopped properly if shutdown animations
were enabled.

Bug: 285241485
Test: Pixel w/ ro.init.shutdown_animation=true
Change-Id: I7f35572b5223f03f3f5a341fa7b5e90c01d56ce3
2023-06-05 12:59:54 -07:00
Daniel Zheng
819a3529b5 Merge "Adding in wipe tasks before other tasks run." 2023-06-05 19:15:30 +00:00
Daniel Zheng
303fb49cc0 Adding in wipe tasks before other tasks run.
if we call -w and a reboot task runs beforehand, we don't actually wipe
the given partitions. We want the wipe to occur before reboots.

Test: fastboot flashall -w
Change-Id: If327c5de0858e222cf5fc14531bc20fb741c2960
2023-06-05 10:30:44 -07:00
Eric Biggers
cc4a15b97a fs_mgr_fstab: allow fileencryption without equals sign
A point of confusion that has been encountered recently is that the
fileencryption argument is optional (since Android 11), yet the fstab
parser requires the equals sign in "fileencryption=".  Thus, someone
wanting to use the default options must use "...,fileencryption=,...".

Make "fileencryption" by itself mean the same thing so that it works as
expected.

Test: atest CtsFsMgrTestCases
Change-Id: I65ce6b9513942bec2107838396835e7aafb3bf37
2023-06-05 14:35:11 +00:00
Automerger Merge Worker
ee3d529d0a Merge changes from topic "am-6109f81bfb984ecaa06f3f826ebeee7d" am: 9bf90f14d4 -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history

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

Change-Id: I10403653a4e3822d10c7e961fa1f24e937a5d097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:35:04 +00:00
Automerger Merge Worker
41975f0f5b [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e -s ours am: 2bb9e20eeb -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history

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

Change-Id: Icc5509eff13b699a15cd4efb6d5eeb991371ded0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:35:02 +00:00
Automerger Merge Worker
2303ad05c3 Merge changes from topic "am-66f20a14a62845e6a805742ccf92e07a" am: 2c20fe32d3 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I0b33dfc32e7c350086aecd5b29834757dd52b6db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:33:24 +00:00
Automerger Merge Worker
54c1fa314b [automerger skipped] Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours am: 6e367cf7e6 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I5d416190ea325670fe25a75cabb9dc27ceae2afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:33:23 +00:00
Automerger Merge Worker
9bf90f14d4 Merge changes from topic "am-6109f81bfb984ecaa06f3f826ebeee7d"
* changes:
  [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e -s ours
  [automerger skipped] Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c am: 4fc18600ac -s ours
2023-06-03 00:49:33 +00:00
Automerger Merge Worker
2bb9e20eeb [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history

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

Change-Id: Ic32842628663805e2402a90d66b5815d45ca19de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:49:30 +00:00
Treehugger Robot
dfffb368ce [automerger skipped] Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c am: 4fc18600ac -s ours
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history

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

Change-Id: I7580cbd4fec14c89bc905e67c6466cb6bba00a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:49:28 +00:00
Automerger Merge Worker
2c20fe32d3 Merge changes from topic "am-66f20a14a62845e6a805742ccf92e07a"
* changes:
  Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours
  [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours
2023-06-03 00:49:00 +00:00
Automerger Merge Worker
6e367cf7e6 Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev am: d42cd6887d -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I183815e0ddc15f9199590428ba0b18ffd962706e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:48:57 +00:00
Treehugger Robot
6a043cd644 [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours am: fcfa292007 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Ife24ef6fbcf7135f658eb88242df5c0b486d33db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:48:56 +00:00
Automerger Merge Worker
0412ff9c1e Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev 2023-06-03 00:21:00 +00:00
Treehugger Robot
4fc18600ac Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246

Change-Id: Ie667cac11be2ee5eef1cc7b434777689757c0a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:20:57 +00:00
Automerger Merge Worker
d42cd6887d Merge changes from topic "am-adb4dc995e83421e9148d1453567507c" into android13-tests-dev
* changes:
  [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours
  [automerger skipped] libsnapshot: Remove flaky image creation test. am: 1136e2fc30 -s ours
2023-06-03 00:19:30 +00:00
Treehugger Robot
fcfa292007 [automerger skipped] Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev am: cf62ede082 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: Ibe542f5442106dd809afd7f679210ea67c6094ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:19:26 +00:00
David Anderson
ad0b3413a7 [automerger skipped] libsnapshot: Remove flaky image creation test. am: 1136e2fc30 -s ours
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history

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

Change-Id: I60f0a27e7df8a4a119fd7e28b74e22dbf67fbddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:19:25 +00:00
Treehugger Robot
11caad9d6c Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev 2023-06-02 23:51:12 +00:00