diff options
author | Florian Mayer <fmayer@google.com> | 2024-05-15 17:48:31 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-15 17:48:31 +0000 |
commit | 53748d08e595066fc138b97051032799d7af7124 (patch) | |
tree | 78fb9961185e097544e3441ad7a569e37d0e6a18 /init | |
parent | 6726655b5c880ac91cf89b5eaef63445ff526309 (diff) | |
parent | 1277bd4dfdd85b05fb864ce0c9fdd0d0085d3610 (diff) | |
download | core-53748d08e595066fc138b97051032799d7af7124.tar.gz |
Merge "Prevent mte_upgrade_test from hanging if MTE is disabled" into main
Diffstat (limited to 'init')
-rw-r--r-- | init/test_upgrade_mte/mte_upgrade_test_helper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/test_upgrade_mte/mte_upgrade_test_helper.cpp b/init/test_upgrade_mte/mte_upgrade_test_helper.cpp index 6728cc6d0..c4b175adc 100644 --- a/init/test_upgrade_mte/mte_upgrade_test_helper.cpp +++ b/init/test_upgrade_mte/mte_upgrade_test_helper.cpp @@ -22,6 +22,7 @@ #include <sys/prctl.h> #include <time.h> #include <unistd.h> + #include <memory> int MaybeDowngrade() { @@ -65,7 +66,5 @@ int main(int argc, char** argv) { // This binary gets run by src/com/android/tests/init/MteUpgradeTest.java, which // asserts that it crashes as expected. f[17] = 'x'; - char buf[1]; - read(1, buf, 1); return 0; } |