commit d7dbfc92eae82ee0f664e43eb17575de4120e966
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 22 23:29:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 22 23:29:15 2022 +0000
tree 16d04b654f4111d2aecebdcf9f18961a63e1b74e
parent e803e63bc50e47c19cfcd3d8243a8f7a81e0cfb0
parent d96b2ac076f0d82d3c2068cf4dda134bedb11dfe

Snap for 8756258 from d96b2ac076f0d82d3c2068cf4dda134bedb11dfe to tm-release

Change-Id: Ia42b7e205c37ca27d6e45a0072292567d72af4cd

IdleMaint.cpp

diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index 426be58..9d3450a 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -391,28 +391,6 @@
 }
 
 static void runDevGc(void) {
-    auto aidl_service_name = AStorage::descriptor + "/default"s;
-    if (AServiceManager_isDeclared(aidl_service_name.c_str())) {
-        ndk::SpAIBinder binder(AServiceManager_waitForService(aidl_service_name.c_str()));
-        if (binder.get() != nullptr) {
-            std::shared_ptr<AStorage> aidl_service = AStorage::fromBinder(binder);
-            if (aidl_service != nullptr) {
-                runDevGcOnHal<IDL::AIDL>(aidl_service, ndk::SharedRefBase::make<AGcCallbackImpl>(),
-                                         &ndk::ScopedAStatus::getDescription);
-                return;
-            }
-        }
-        LOG(WARNING) << "Device declares " << aidl_service_name
-                     << " but it is not running, skip dev GC on AIDL HAL";
-        return;
-    }
-    auto hidl_service = HStorage::getService();
-    if (hidl_service != nullptr) {
-        runDevGcOnHal<IDL::HIDL>(hidl_service, sp<HGcCallbackImpl>(new HGcCallbackImpl()),
-                                 &Return<void>::description);
-        return;
-    }
-    // fallback to legacy code path
     runDevGcFstab();
 }