commit 15b9656ae9acfbed4af62b8cecba30c35cd514a8
author Yifan Hong <elsk@google.com> Thu Sep 20 17:26:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 20 17:26:53 2018 +0000
tree dadf0857bea197645fb880d9a7a5e65c10ea256a
parent 1934619b8b0a1277e89876bdf070358ce68e5a5a
parent 91a68dfc98defe4de8630290b0dcff0311de6678

Merge "health.filesystem HAL renamed to health.storage"

Android.bp

diff --git a/Android.bp b/Android.bp
index 080c5fe..8fd29f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -140,7 +140,7 @@
         },
     },
     shared_libs: [
-        "android.hardware.health.filesystem@1.0",
+        "android.hardware.health.storage@1.0",
     ],
 }
 
@@ -173,7 +173,7 @@
     ],
 
     shared_libs: [
-        "android.hardware.health.filesystem@1.0",
+        "android.hardware.health.storage@1.0",
         "libhidltransport",
     ],
 }

IdleMaint.cpp

diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index ff2ebc5..79894fc 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -27,7 +27,7 @@
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
-#include <android/hardware/health/filesystem/1.0/IFileSystem.h>
+#include <android/hardware/health/storage/1.0/IStorage.h>
 #include <fs_mgr.h>
 #include <hardware_legacy/power.h>
 #include <private/android_filesystem_config.h>
@@ -47,9 +47,9 @@
 using android::base::WriteStringToFile;
 using android::hardware::Return;
 using android::hardware::Void;
-using android::hardware::health::filesystem::V1_0::IFileSystem;
-using android::hardware::health::filesystem::V1_0::IGarbageCollectCallback;
-using android::hardware::health::filesystem::V1_0::Result;
+using android::hardware::health::storage::V1_0::IGarbageCollectCallback;
+using android::hardware::health::storage::V1_0::IStorage;
+using android::hardware::health::storage::V1_0::Result;
 
 namespace android {
 namespace vold {
@@ -344,7 +344,7 @@
     Result mResult{Result::UNKNOWN_ERROR};
 };
 
-static void runDevGcOnHal(sp<IFileSystem> service) {
+static void runDevGcOnHal(sp<IStorage> service) {
     LOG(DEBUG) << "Start Dev GC on HAL";
     sp<GcCallback> cb = new GcCallback();
     auto ret = service->garbageCollect(DEVGC_TIMEOUT_SEC, cb);
@@ -356,7 +356,7 @@
 }
 
 static void runDevGc(void) {
-    auto service = IFileSystem::getService();
+    auto service = IStorage::getService();
     if (service != nullptr) {
         runDevGcOnHal(service);
     } else {