Commit graph

81203 commits

Author SHA1 Message Date
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
7988a0d0ae Merge "Avoid creating a storage folder for fastboot devices command" 2023-06-02 22:04:40 +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
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
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
b991aeb5f7 Merge "Halve iteration count for some RefBase tests" 2023-05-31 23:54:43 +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
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
437fb0c606 Merge "Removing should_flash_in_userspace check" 2023-05-30 15:34:50 +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
1442d47bd6 Merge "Check get_gwp_asan_callbacks before calling." 2023-05-26 19:03:01 +00:00
Will McVicker
d278f1d018 toolbox/modprobe: Fix fallback path when mod_dirs is empty
Due to GKI, the kernel UTS release string will not always (if ever)
match the vendor's UTS release string that is used to create the
initramfs file structure -- /lib/modules/<vendor uname>. This causes
module load failures when `-d DIR` is omitted. To fix this, we can
include all of the versions under /lib/modules that match the kernel's
major and minor version instead of directly using the value of uname().
In addition, we can also support modules being loaded directly from
/lib/modules.

Test: verify GKI kernel + initramfs with different UTS strings
Test: verify GKI kernel + initramfs with modules directly in /lib/modules
Fixes: 8320778425 ("toolbox/modprobe: Fallback to /lib/modules/<uname> ")
Bug: 282917063
Bug: 254835242
Change-Id: I5368f5cff139ba3165323a6a91066be38bfa0736
2023-05-26 11:01:00 -07:00
Treehugger Robot
76323f64be Merge "BatteryMonitor: support battery health INCONSISTENT from health status" 2023-05-26 02:33:22 +00:00
Daniel Zheng
30e648b346 Keeping naming consistent
Test: m fastboot
Change-Id: I46d798fa2ce78a255dc0ea414f5e25782f45c4d1
2023-05-25 15:56:29 -07:00
Daniel Zheng
2775df617e Removing should_flash_in_userspace check
This check isn't needed as super_flash_helper.cpp calls a different
should_flash_in_userspace that isn't reliant on $ANDROID_PRODUCT_OUT
being set. Current code will fail when calling fastboot update

Test: fastboot update update.zip without calling lunch
Bug: 283330320
Change-Id: Icefe6092befb747b7f419ea997e0834602808d69
2023-05-25 15:14:59 -07:00
Treehugger Robot
059954a6b2 Merge "Chang flash task to take in source" 2023-05-25 21:46:01 +00:00
Daniel Zheng
791a83bb45 Chang flash task to take in source
Old changes didn't actually take into account sources. fastboot update
{update.zip} should read fastboot-info from the update package. It was
instead flashing local images + reading local fastboot-info.txt

Test: m fastboot, fastboot update, fastboot flashall
Bug: 283330320

Change-Id: I9587a7735ddfbfb661153eb12ebc3caa7c32f141
2023-05-25 13:29:16 -07:00
Christopher Ferris
004a16739d Check get_gwp_asan_callbacks before calling.
When using the bootstrap linker, the get_gwp_asan_callbacks is
not set. Therefore, check it is not nullptr before calling it
during crash processing.

Bug: 284098779

Test: Ran crasher64 using /system/bin/bootstrap/linker64 and verify
Test: debuggerd code does not crash.
Test: All unit tests pass.
Change-Id: Ifc710fe4bef24661700444a1b69432bfc29d580f
2023-05-25 12:42:41 -07:00
Treehugger Robot
2dc80e3805 Merge "Updated the policy file associated with riscv64" 2023-05-25 17:29:40 +00:00
liwentao
4d8f37edae Updated the policy file associated with riscv64
The generate.sh script can generate the file, but current policy file does not match it.
And the rules are not appropriate, like missing "sysinfo", causing the
debuggerd_test to fail in system model. So we match the policy to
what it should be.

Test: make debuggerd_test

Change-Id: I57ebd7713f2ab939d01bfefcc7935e234fdd3e13
Signed-off-by: liwentao <liwentao@eswincomputing.com>
2023-05-25 18:08:02 +08:00
Treehugger Robot
852e22d7c3 Merge "ueventd: Wait for runtime apex before running external firmware handler" 2023-05-25 01:40:10 +00:00
Christopher Ferris
ec56afc415 Merge "Limit the number of log messages in a tombstone." 2023-05-25 00:27:47 +00:00
Christopher Ferris
98d6242dc7 Limit the number of log messages in a tombstone.
Some testing environments can have a test that is sending many
thousands of messages to the log. When this type of process crashes
all of these log messages are captured and can cause OOM errors
while creating the tombstone.

Added a test to verify the log messages are truncated. Leaving this
test disabled for now since it is inherently flaky due to having to
assume that 500 messages are in the log.

Added a test for a newline in a log message since it's somewhat
related to this change.

NOTE: The total number of messages is capped at 500, but if a message
contains multiple newlines, the total messages will exceed 500.
Counting messages this way seems to be in the spirit of the cap,
that a process logging a large message with multiple newlines does
not completely fill the tombstone log data.

Bug: 269182937
Bug: 282661754

Test: All unit tests pass.
Test: The disabled max_log_messages test passes.
Change-Id: If18e62b29f899c2c4670101b402e37762bffbec6
2023-05-24 20:10:55 +00:00
Treehugger Robot
eb8079e656 Merge "Fix overflow issue when computing ideal size of scratch partition" 2023-05-24 05:35:50 +00:00
Jack Wu
8231c3fe2d BatteryMonitor: support battery health INCONSISTENT from health status
Report Battery health INCONSISTENT when there is a battery recalibration
pending.

Bug: 283182048
Test: m
Change-Id: I8b944ddac7cc919fc95b1b71b015101642a62f96
Signed-off-by: Jack Wu <wjack@google.com>
2023-05-24 03:25:59 +00:00
Daniel Zheng
5efd90644b Merge "Fixing constructors to match header files" 2023-05-24 00:06:09 +00:00
Steven Moreland
89a4db46f5 Merge "init_kill_services_test: special case apexd" 2023-05-23 18:18:02 +00:00
Steven Moreland
4350592133 init_kill_services_test: special case apexd
apexd restarts the device, so it causes flakes here,
especially in presubmit.

Bug: 280514080
Test: init_kill_services_test

Change-Id: I4455704795961f3ae94e29bdf098eca739130973
2023-05-23 18:17:57 +00:00
Daniel Zheng
5a9905a62b Fixing constructors to match header files
Constructor in cpp file doesn't match header file

Test: m fastboot, fastboot flashall -w
Change-Id: I2c720bb594efca5af1e5a374277543a522ced5ef
2023-05-23 10:51:01 -07:00
Treehugger Robot
280fd9f011 Merge "Remove libdiskconfig as it is no longer used" 2023-05-23 16:33:31 +00:00
Ray Chin
702a779edb Fix overflow issue when computing ideal size of scratch partition
The type of f_frsize is `unsigned long` which is 32 bit for some system so it will overflow after multiplied by f_bfree. This solution adds one more type casting to ensure the type is 64 bit unsigned integer during the computing.

Bug: 281599020
Test: adb root; adb shell disable-verity
Change-Id: I377ed722d5e245c235c3ae12ff66ac7e91d1d6e8
2023-05-23 09:49:19 +00:00
Devin Moore
5729d860cd Remove libdiskconfig as it is no longer used
Test: m
Bug: 280829178
Change-Id: I1da275ef13dea92b8c1021aa3d658569c4cf782e
2023-05-23 00:24:04 +00:00
Christopher Ferris
34de747570 Merge "debuggerd: simplify output handling" 2023-05-22 19:31:45 +00:00