Commit graph

81685 commits

Author SHA1 Message Date
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
Treehugger Robot
cf62ede082 Merge "libsnapshot: Remove flaky image creation test." into android12L-tests-dev 2023-06-02 23:51:10 +00:00
Edward Liaw
e2aba20f19 KernelLibcutilsTest: change test file push location
Upload files to /data/local/tests/unrestricted instead to improve data
collection in the event of a crash.

Bug: 284307085
Bug: 258819618
Bug: 199904562
Test: atest KernelLibcutilsTest
Change-Id: Iff816fd3276b24507c60eddc1bcd3f2c2184c27d
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-06-02 23:39:48 +00:00
Dmitrii Merkurev
6707cdef81 Merge "Avoid creating a storage folder for fastboot devices command" am: 7988a0d0ae
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2613189

Change-Id: Ic93c4bba9ad78a072572908e174fb4488e76d8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 22:46:31 +00:00
Dmitrii Merkurev
7988a0d0ae Merge "Avoid creating a storage folder for fastboot devices command" 2023-06-02 22:04:40 +00:00
Edward Liaw
2b98e15e9d Merge "TEST_MAPPING: enable KernelLibcutilsTest in kernel-presubmit" am: 0d02ecd816
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2606493

Change-Id: I3ce3dc3da562d16313346de4acf6b17b7f478fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 20:05:16 +00:00
Edward Liaw
0d02ecd816 Merge "TEST_MAPPING: enable KernelLibcutilsTest in kernel-presubmit" 2023-06-02 19:28:18 +00:00
Dmitrii Merkurev
6c008ff888 Avoid creating a storage folder for fastboot devices command
Bug: 284267164
Bug: 284786311
Test: fastboot devices doesn't create a .fastboot folder
Change-Id: I3e44c2a838e4287e6220c18f6e805cc71e0c9669
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-06-02 12:44:31 +01:00
Vova Sharaienko
85b26b119b Merge "Increasing length of the datagram for Unix Domain Socket" am: bce8618a16
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2611379

Change-Id: I6f7698f7acaedbab01026a25ca2ddba1db9c365d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 01:23:36 +00:00
Vova Sharaienko
bce8618a16 Merge "Increasing length of the datagram for Unix Domain Socket" 2023-06-02 00:24:03 +00:00
Vova Sharaienko
ab5e525050 Increasing length of the datagram for Unix Domain Socket
- address p99 StatsD socket loss issue

Bug: 284508851
Test: atest statsd_test
Test: atest statsd_benchmark
Ignore-AOSP-First: mitigate data loss in Android U
Change-Id: I4124ba8d4d78733eb666073f6d29dfe0c0552c0f
Merged-In: I4124ba8d4d78733eb666073f6d29dfe0c0552c0f
2023-06-01 22:04:22 +00:00
Martin Stjernholm
57ecc692b0 Merge "Run art_boot before odsign." am: fadbbc94f8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2590147

Change-Id: I928040e08beaabdd7db5868c5b54db3bd98d5c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 19:00:33 +00:00
Martin Stjernholm
fadbbc94f8 Merge "Run art_boot before odsign." 2023-06-01 18:22:49 +00:00
David Anderson
1136e2fc30 libsnapshot: Remove flaky image creation test.
This test has always been flaky, and is not testing something super
valuable: we know that image creation succeeds throughout the rest of
the suite, so it's not very interesting to know that it can succeed in a
low-space scenario.

The inverse test is much more valuable, since we want the correct status
code when creation fails due to low space.

Bug: 240391002
Test: vts_libsnapshot_test
Merged-In: I6235d11033d2f30efe530077b877863ba2574810
Change-Id: I6235d11033d2f30efe530077b877863ba2574810
(cherry picked from commit 97e8a2f0e9)
2023-06-01 15:49:51 +00:00
David Anderson
c786b6d332 libsnapshot: Use SnapshotManager to delete devices.
Diagnosing DM_DEV_REMOVE failures in the test harness is quite
difficult, and it's not clear if failures are spurious or not. Instead
use SnapshotManager's helper function, which can retry on failure, and
will self-diagnose issues on legitimate failures.

Bug: N/A
Test: vts_libsnapshot_test
Change-Id: Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685
Merged-In: Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685
(cherry picked from commit e02ef9e9ce)
2023-06-01 14:20:03 +00:00
Treehugger Robot
a0168b9a40 Merge "Halve iteration count for some RefBase tests" am: b991aeb5f7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2609858

Change-Id: I4c6495197781dfd5561ed62f5110c428e4c5da77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 00:28:54 +00:00
Treehugger Robot
b991aeb5f7 Merge "Halve iteration count for some RefBase tests" 2023-05-31 23:54:43 +00:00
Treehugger Robot
fb32e6be97 Merge "Reverting code to old flashing code" am: 507c5f9476
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2606492

Change-Id: I2bd5fd8661d316cac44ca72f396812bbc1e77bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31 22:33:30 +00:00
Treehugger Robot
507c5f9476 Merge "Reverting code to old flashing code" 2023-05-31 21:46:44 +00:00
Daniel Zheng
2a56592d58 Reverting code to old flashing code
Falling back on old flashing code until fastboot-info is fixed

Test: m fastboot, fastboot flashall
Change-Id: I10146ec75f75d57d4a4049d35def370533619401
2023-05-31 11:20:08 -07:00
Edward Liaw
f8a9ba13f5 TEST_MAPPING: enable KernelLibcutilsTest in kernel-presubmit
Bug: 284307085
Bug: 258819618
Test: atest :kernel-presubmit
Change-Id: Ifa3427d3b7ff66d25ba58f5d16d0d62a709274a0
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-05-31 17:29:17 +00:00
Hans Boehm
3e8ad4d546 Halve iteration count for some RefBase tests
The RacingDestructors test was occasionally timing out, by non-huge
amounts. Halve the number of iterations for long-running tests here.

Bug: 284964396
Test: Treehugger
Change-Id: If639ce98fbeb783431f07006dece4cd69f9f8b50
2023-05-31 10:19:54 -07:00
Daniel Zheng
93ca33671f Merge changes Ib72f6a1c,I46d798fa am: 3c962eee3a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2609188

Change-Id: I6046d9681b01090e93e60a25054e0f489e542629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 21:04:07 +00:00
Daniel Zheng
3c962eee3a Merge changes Ib72f6a1c,I46d798fa
* changes:
  Update add resizetasks to work in update
  Keeping naming consistent
2023-05-30 20:26:06 +00:00
Daniel Zheng
997ce15d5e Update add resizetasks to work in update
Old should_flash_in_userspace doesn't work if $ANDROID_PRODUCT_OUT is
not set. Also adding in a check to see if resizetasks were added
correctly

Test: fastboot update update.zip without $ANDROID_PRODUCT_OUT and
removing the flashsuperlayout code.
Bug: 283330320

Change-Id: Ib72f6a1cf07745daf70fffae3d1a6b8352e3f79c
2023-05-30 09:24:46 -07:00
Daniel Zheng
a8e0dc0110 Merge "Removing should_flash_in_userspace check" am: 437fb0c606
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2606013

Change-Id: Ia727662b8115538b8366a3fc7dcd7260965dfc11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-30 16:02:18 +00:00
Daniel Zheng
437fb0c606 Merge "Removing should_flash_in_userspace check" 2023-05-30 15:34:50 +00:00
William McVicker
fba6478956 Merge "toolbox/modprobe: Fix fallback path when mod_dirs is empty" am: 0cea31e50b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2606015

Change-Id: I7b62f920f8a57c8bc14b8d929dcc92b6d01db77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:43:06 +00:00
William McVicker
0cea31e50b Merge "toolbox/modprobe: Fix fallback path when mod_dirs is empty" 2023-05-26 20:34:09 +00:00
Christopher Ferris
81de4e3faa Merge "Check get_gwp_asan_callbacks before calling." am: 1442d47bd6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2603908

Change-Id: Ie3c1abb3f36edc0169a9107692b923d9edd94726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:25:51 +00:00
Christopher Ferris
1442d47bd6 Merge "Check get_gwp_asan_callbacks before calling." 2023-05-26 19:03:01 +00:00