commit 3420a1a4cce33b83c2fd45b3128f9f106bac359a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 20 06:14:56 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 20 06:14:56 2024 +0000
tree adb3f4ead7dfaaecfcc116f84b36511aa5d09f4b
parent 9c963e13d61b304bb1e8ed9e580be82616863f39
parent 5232f86082c842524822ff6683212d7e95159f08

Merge "Replace base::RandInt with std::uniform_int_distribution" into main am: d53b098097 am: 5232f86082

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

Change-Id: Ib9690fb4825c209552477a58a757d2bafb0f6c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libfs_avb/tests/avb_util_test.cpp

diff --git a/fs_mgr/libfs_avb/tests/avb_util_test.cpp b/fs_mgr/libfs_avb/tests/avb_util_test.cpp
index 5dc26ac..85eeeb0 100644
--- a/fs_mgr/libfs_avb/tests/avb_util_test.cpp
+++ b/fs_mgr/libfs_avb/tests/avb_util_test.cpp
@@ -16,10 +16,11 @@
 
 #include <endian.h>
 
+#include <random>
+
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
 #include <base/files/file_util.h>
-#include <base/rand_util.h>
 #include <libavb/libavb.h>
 
 #include "avb_util.h"
@@ -727,7 +728,10 @@
 
     // Introduces a new modification.
     if (length > 0) {
-        int modify_location = base::RandInt(offset, offset + length - 1);
+        // mersenne_twister_engine seeded with the default seed source.
+        static std::mt19937 gen(std::random_device{}());
+        std::uniform_int_distribution<> rand_distribution(offset, offset + length - 1);
+        int modify_location = rand_distribution(gen);
         file_content[modify_location] ^= 0x80;
         last_file_path = file_path.value();
         last_modified_location = modify_location;