commit 25c1a3b8543dd1756308424dd65030f90bb7a99f
author Sebastian Pickl <spickl@google.com> Mon Oct 30 08:02:24 2023 +0000
committer Sebastian Pickl <spickl@google.com> Mon Oct 30 11:26:22 2023 +0000
tree 47483af2f39a1ff2d26442658ff43f0de44c70ac
parent 84b7cff1a7082d32e9043014e57db7b4ed2aa7a0

Revert "Use std::unique_ptr instead of ScopeGuard"

Revert submission 2780893

Reason for revert: breaking boot tests

Bug: 308214260

Reverted changes: /q/submissionid:2780893

Change-Id: I7a4ee9a45583a8a1d4a33447de55c63e6ce9d42a

libs/binder/tests/binderAllocationLimits.cpp

diff --git a/libs/binder/tests/binderAllocationLimits.cpp b/libs/binder/tests/binderAllocationLimits.cpp
index 7e0b594..6712c9c 100644
--- a/libs/binder/tests/binderAllocationLimits.cpp
+++ b/libs/binder/tests/binderAllocationLimits.cpp
@@ -16,7 +16,6 @@
 
 #include <android-base/logging.h>
 #include <binder/Binder.h>
-#include <binder/Functional.h>
 #include <binder/IServiceManager.h>
 #include <binder/Parcel.h>
 #include <binder/RpcServer.h>
@@ -29,8 +28,6 @@
 #include <functional>
 #include <vector>
 
-using namespace android::binder::impl;
-
 static android::String8 gEmpty(""); // make sure first allocation from optimization runs
 
 struct DestructionAction {
@@ -175,18 +172,6 @@
     a_binder->pingBinder();
 }
 
-TEST(BinderAllocation, MakeScopeGuard) {
-    const auto m = ScopeDisallowMalloc();
-    {
-        auto guard1 = make_scope_guard([] {});
-        guard1.release();
-
-        auto guard2 = make_scope_guard([&guard1, ptr = imaginary_use] {
-            if (ptr == nullptr) guard1.release();
-        });
-    }
-}
-
 TEST(BinderAllocation, InterfaceDescriptorTransaction) {
     sp<IBinder> a_binder = GetRemoteBinder();
 

libs/binder/tests/binderLibTest.cpp

diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index eaf426d..341e9ce 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -30,11 +30,11 @@
 #include <android-base/properties.h>
 #include <android-base/result-gmock.h>
 #include <android-base/result.h>
+#include <android-base/scopeguard.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
 #include <binder/Binder.h>
 #include <binder/BpBinder.h>
-#include <binder/Functional.h>
 #include <binder/IBinder.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
@@ -52,7 +52,6 @@
 #define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
 
 using namespace android;
-using namespace android::binder::impl;
 using namespace std::string_literals;
 using namespace std::chrono_literals;
 using android::base::testing::HasValue;
@@ -1326,7 +1325,7 @@
     ASSERT_EQ(0, ret);
 
     // Restore the original file limits when the test finishes
-    auto guardUnguard = make_scope_guard([&]() { setrlimit(RLIMIT_NOFILE, &origNofile); });
+    base::ScopeGuard guardUnguard([&]() { setrlimit(RLIMIT_NOFILE, &origNofile); });
 
     rlimit testNofile = {1024, 1024};
     ret = setrlimit(RLIMIT_NOFILE, &testNofile);