Merge "Use libprocessgroup to find cgroup v2 paths" into main am: 94cadf0156 am: f07c0d6636

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3394790

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

1 files changed, 6 insertions, 1 deletions

diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index 08fa03cfd6..c038c95b07 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -344,7 +344,12 @@ class BinderLibTest : public ::testing::Test {
         }
 
         bool checkFreezeSupport() {
-            std::ifstream freezer_file("/sys/fs/cgroup/uid_0/cgroup.freeze");
+            std::string path;
+            if (!CgroupGetAttributePathForTask("FreezerState", getpid(), &path)) {
+                return false;
+            }
+
+            std::ifstream freezer_file(path);
             // Pass test on devices where the cgroup v2 freezer is not supported
             if (freezer_file.fail()) {
                 return false;